Author: csutherl
Date: Mon Oct  3 15:55:16 2016
New Revision: 1763178

URL: http://svn.apache.org/viewvc?rev=1763178&view=rev
Log:
The SecurityClassLoad loadLoaderPackage had an incorrect basePackage and 
WebappClassLoaderBase class setting. This caused a CNFE on both 
org.apache.catalina.ResourceEntry and org.apache.catalina.WebappClassLoaderBase 
and prevented tomcat from starting with the security manager enabled.

Modified:
    
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1763178&r1=1763177&r2=1763178&view=diff
==============================================================================
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
Mon Oct  3 15:55:16 2016
@@ -75,13 +75,13 @@ public final class SecurityClassLoad {
     
     private final static void loadLoaderPackage(ClassLoader loader)
         throws Exception {
-        String basePackage = "org.apache.catalina.";
+        String basePackage = "org.apache.catalina.loader.";
         loader.loadClass
             (basePackage +
              "ResourceEntry");
         loader.loadClass
             (basePackage +
-             "WebappClassLoaderBase$PrivilegedFindResourceByName");
+             "WebappClassLoader$PrivilegedFindResourceByName");
     }
     
     



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to