Author: markt
Date: Mon May 24 17:03:37 2010
New Revision: 947717
URL: http://svn.apache.org/viewvc?rev=947717&view=rev
Log:
Fix some TCK failures with the BIO AJP connector when using a security manager
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=947717&r1=947716&r2=947717&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Mon
May 24 17:03:37 2010
@@ -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();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
