[jboss-cvs] JBossAS SVN: r88193 - projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/spi/base.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-05-05 02:29:39 -0400 (Tue, 05 May 2009)
New Revision: 88193

Modified:
   projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java
Log:
Move failIfBL to the check method.

Modified: projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java	2009-05-05 06:25:50 UTC (rev 88192)
+++ projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java	2009-05-05 06:29:39 UTC (rev 88193)
@@ -240,7 +240,7 @@
 
       String path = ClassLoaderUtils.classNameToPath(name);
 
-      checkClassBlackList(classLoader, name, path, allExports);
+      checkClassBlackList(classLoader, name, path, allExports, true);
 
       boolean findInParent = (isUseLoadClassForParent() == false);
 
@@ -1465,13 +1465,16 @@
     * @param name the name
     * @param path the path of the class resource
     * @param allExports whether to look at all exports
+    * @param failIfBlackListed <code>true</code> if a blacklisted class should
+    *                          result in ClassNotFoundException; <code>false</code>
+    *                          if a <code>null</code> return value is acceptable
     * @throws ClassNotFoundException when the class is blacklisted
     */
-   void checkClassBlackList(BaseClassLoader classLoader, String name, String path, boolean allExports) throws ClassNotFoundException
+   void checkClassBlackList(BaseClassLoader classLoader, String name, String path, boolean allExports, boolean failIfBlackListed) throws ClassNotFoundException
    {
       if (allExports)
       {
-         if (globalClassBlackList.containsKey(path))
+         if (failIfBlackListed && globalClassBlackList.containsKey(path))
          {
             if (log.isTraceEnabled())
                log.trace("Found " + name + " in global blacklist");
@@ -1491,7 +1494,7 @@
     *                          result in ClassNotFoundException; <code>false</code>
     *                          if a <code>null</code> return value is acceptable
     * @return the class when found in the cache
-    * @throws ClassNotFoundException when the class is blacklisted and 
+    * @throws ClassNotFoundException when the class is blacklisted and
     *                               <code>failIfBlackListed</code> is <code>true</code>
     */
    protected Class<?> checkClassCacheAndBlackList(BaseClassLoader classLoader, String name, String path, boolean allExports, boolean failIfBlackListed) throws ClassNotFoundException
@@ -1502,11 +1505,9 @@
       Class<?> result = checkClassCache(classLoader, name, path, allExports);
       if (result != null)
          return result;
-      
-      if (failIfBlackListed)
-      {
-         checkClassBlackList(classLoader, name, path, allExports);
-      }
+
+      checkClassBlackList(classLoader, name, path, allExports, failIfBlackListed);
+
       return null;
    }