[jboss-cvs] JBossAS SVN: r107433 - projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base.

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

Author: alesj
Date: 2010-08-05 05:42:41 -0400 (Thu, 05 Aug 2010)
New Revision: 107433

Modified:
   projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java
Log:
Move local check before after, check policy' cache for explicit imports.

Modified: projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java
===================================================================
--- projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java	2010-08-05 09:01:22 UTC (rev 107432)
+++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java	2010-08-05 09:42:41 UTC (rev 107433)
@@ -1542,11 +1542,11 @@
       if (result != null)
          return result;
 
-      result = checkCacheAfter(classLoader, name, path, allExports);
+      result = checkClassCacheLocally(classLoader, name, path, allExports);
       if (result != null)
          return result;
 
-      result = checkClassCacheLocally(classLoader, name, path, allExports);
+      result = checkCacheAfter(classLoader, name, path, allExports);
       if (result != null)
          return result;
 
@@ -1575,6 +1575,16 @@
             return item.clazz;
          }
       }
+      else
+      {
+         BaseClassLoaderPolicy policy = classLoader.getPolicy();
+         ClassLoaderCache cache = policy.getCache();
+         if (cache != null)
+         {
+            Loader loader = cache.getCachedLoader(name);
+            return (loader != null) ? loader.loadClass(name) : null;
+         }
+      }
       return null;
    }