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

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

Author: alesj
Date: 2010-07-30 16:57:39 -0400 (Fri, 30 Jul 2010)
New Revision: 107248

Modified:
   projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderCacheWrapper.java
Log:
Only check imported if actually found in cache.

Modified: projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderCacheWrapper.java
===================================================================
--- projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderCacheWrapper.java	2010-07-30 19:21:56 UTC (rev 107247)
+++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderCacheWrapper.java	2010-07-30 20:57:39 UTC (rev 107248)
@@ -68,10 +68,13 @@
 
    public Loader getCachedLoader(String name)
    {
-      if (isImported(ImportType.ALL, name))
-         return delegate.getCachedLoader(name);
-      else
-         return null;
+      Loader loader = delegate.getCachedLoader(name);
+      if (loader != null)
+      {
+         if (isImported(ImportType.ALL, name) == false)
+            loader = null; // should not be exposed
+      }
+      return loader;
    }
 
    public Loader findLoader(ImportType type, String name)
@@ -110,10 +113,13 @@
 
    public URL getCachedResource(String name)
    {
-      if (isImported(ImportType.ALL, name))
-         return delegate.getCachedResource(name);
-      else
-         return null;
+      URL url = delegate.getCachedResource(name);
+      if (url != null)
+      {
+         if (isImported(ImportType.ALL, name) == false)
+            url = null; // should not be exposed
+      }
+      return url;
    }
 
    public URL findResource(ImportType type, String name)