You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/12/17 19:47:49 UTC

svn commit: r1551652 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

Author: markt
Date: Tue Dec 17 18:47:49 2013
New Revision: 1551652

URL: http://svn.apache.org/r1551652
Log:
Refactor to enable some basic unit testing

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=1551652&r1=1551651&r2=1551652&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java (original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Tue Dec 17 18:47:49 2013
@@ -30,10 +30,15 @@ package org.apache.catalina.security;
 
 public final class SecurityClassLoad {
 
-    public static void securityClassLoad(ClassLoader loader)
-        throws Exception {
+    public static void securityClassLoad(ClassLoader loader) throws Exception {
+        securityClassLoad(loader, true);
+    }
+
+
+    static void securityClassLoad(ClassLoader loader, boolean requireSecurityManager)
+            throws Exception {
 
-        if( System.getSecurityManager() == null ){
+        if (requireSecurityManager && System.getSecurityManager() == null) {
             return;
         }
 
@@ -280,8 +285,9 @@ public final class SecurityClassLoad {
         loader.loadClass(basePackage +
                 "util.net.NioBlockingSelector$BlockPoller$3");
         loader.loadClass(basePackage + "util.net.SSLSupport$CipherData");
+        // threads
         loader.loadClass
-            (basePackage + "util.net.AbstractEndpoint$PrivilegedSetTccl");
+            (basePackage + "util.threads.TaskThreadFactory$PrivilegedSetTccl");
     }
 }
 



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