[jboss-cvs] JBossAS SVN: r107249 - 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 17:17:35 -0400 (Fri, 30 Jul 2010)
New Revision: 107249

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/ClassLoaderInformation.java
Log:
Simplify imported usage.

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 20:57:39 UTC (rev 107248)
+++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderCacheWrapper.java	2010-07-30 21:17:35 UTC (rev 107249)
@@ -48,15 +48,14 @@
    /**
     * Is the resource imported by our classloader.
     *
-    * @param type the type
     * @param name the resource name
     * @return true if it's imported, false otherwise
     */
-   protected boolean isImported(ImportType type, String name)
+   protected boolean isImported(String name)
    {
       if (info != null)
       {
-         Set<String> imports = info.getImportedPackages(type);
+         Set<String> imports = info.getImportedPackages();
          if (imports.isEmpty() == false)
          {
             String pckg = ClassLoaderInformation.getResourcePackageName(name);
@@ -71,7 +70,7 @@
       Loader loader = delegate.getCachedLoader(name);
       if (loader != null)
       {
-         if (isImported(ImportType.ALL, name) == false)
+         if (isImported(name) == false)
             loader = null; // should not be exposed
       }
       return loader;
@@ -102,13 +101,15 @@
 
    public boolean isBlackListedClass(String name)
    {
-      return delegate.isBlackListedClass(name);
+      return delegate.isBlackListedClass(name) && isImported(name);
    }
 
    public void blackListClass(String name)
    {
-      if (isImported(ImportType.ALL, name))
+      if (isImported(name))
+      {
          delegate.blackListClass(name);
+      }
    }
 
    public URL getCachedResource(String name)
@@ -116,7 +117,7 @@
       URL url = delegate.getCachedResource(name);
       if (url != null)
       {
-         if (isImported(ImportType.ALL, name) == false)
+         if (isImported(name) == false)
             url = null; // should not be exposed
       }
       return url;
@@ -147,13 +148,15 @@
 
    public boolean isBlackListedResource(String name)
    {
-      return delegate.isBlackListedResource(name);
+      return delegate.isBlackListedResource(name) && isImported(name);
    }
 
    public void blackListResource(String name)
    {
-      if (isImported(ImportType.ALL, name))
+      if (isImported(name))
+      {
          delegate.blackListResource(name);
+      }
    }
 
    public void flushCaches()

Modified: projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderInformation.java
===================================================================
--- projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderInformation.java	2010-07-30 20:57:39 UTC (rev 107248)
+++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderInformation.java	2010-07-30 21:17:35 UTC (rev 107249)
@@ -342,12 +342,11 @@
    /**
     * Get imported packages.
     *
-    * @param type the type
     * @return the imported packages
     */
-   Set<String> getImportedPackages(ImportType type)
+   Set<String> getImportedPackages()
    {
-      Map<String, List<Loader>> map = index.get(type);
+      Map<String, List<Loader>> map = index.get(ImportType.ALL);
       return (map != null) ? map.keySet() : Collections.<String>emptySet();
    }