From 1fbd418b1446855e9c135f352029a6fedd4b56b0 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 24 May 2010 17:03:37 +0000 Subject: [PATCH] Fix some TCK failures with the BIO AJP connector when using a security manager git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@947717 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/security/SecurityClassLoad.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java b/java/org/apache/catalina/security/SecurityClassLoad.java index 589806782..be106063e 100644 --- a/java/org/apache/catalina/security/SecurityClassLoad.java +++ b/java/org/apache/catalina/security/SecurityClassLoad.java @@ -129,9 +129,9 @@ public final class SecurityClassLoad { private final static void loadUtilPackage(ClassLoader loader) throws Exception { - String basePackage = "org.apache.catalina."; - loader.loadClass(basePackage + "util.Enumerator"); - loader.loadClass(basePackage + "util.ParameterMap"); + String basePackage = "org.apache.catalina.util."; + loader.loadClass(basePackage + "Enumerator"); + loader.loadClass(basePackage + "ParameterMap"); } @@ -237,6 +237,10 @@ public final class SecurityClassLoad { loader.loadClass(basePackage + "util.net.SSLSupport$CipherData"); loader.loadClass (basePackage + "util.net.JIoEndpoint$PrivilegedSetTccl"); + // Make sure system property is read at this point + Class clazz = loader.loadClass( + basePackage + "util.http.FastHttpDateFormat"); + clazz.newInstance(); } } -- 2.11.0