[jboss-cvs] JBossAS SVN: r107247 - in projects/jboss-cl/trunk: classloader/src/main/java/org/jboss/classloader/spi/base and 1 other directories.

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

Author: alesj
Date: 2010-07-30 15:21:56 -0400 (Fri, 30 Jul 2010)
New Revision: 107247

Modified:
   projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/DelegateLoader.java
   projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderInformation.java
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java
Log:
Don't expose any packages for wildcard delegate.

Modified: projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/DelegateLoader.java
===================================================================
--- projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/DelegateLoader.java	2010-07-30 18:33:10 UTC (rev 107246)
+++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/DelegateLoader.java	2010-07-30 19:21:56 UTC (rev 107247)
@@ -70,6 +70,17 @@
    }
 
    /**
+    * Get package names.
+    *
+    * @return the package names
+    */
+   public String[] getPackageNames()
+   {
+      ClassLoaderPolicy policy = getPolicy();
+      return (policy != null) ? policy.getPackageNames() : null;
+   }
+
+   /**
     * Get the ClassLoaderPolicy associated with this DelegateLoader.
     *
     * @return the class loader policy

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 18:33:10 UTC (rev 107246)
+++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/ClassLoaderInformation.java	2010-07-30 19:21:56 UTC (rev 107247)
@@ -131,7 +131,7 @@
                cantBlacklist++;
             }
 
-            addLoaderToIndex(delegate, delegatePolicy, importType, ImportType.ALL);
+            addLoaderToIndex(delegate, importType, ImportType.ALL);
          }
 
          this.delegates = Collections.synchronizedMap(temp);
@@ -270,7 +270,7 @@
             cantBlacklist++;
          }
 
-         addLoaderToIndex(loader, policy, type, ImportType.ALL);
+         addLoaderToIndex(loader, type, ImportType.ALL);
       }
    }
 
@@ -334,7 +334,7 @@
                   restoreBlackList();
             }
 
-            removeLoaderFromIndex(loader, policy, type, ImportType.ALL);
+            removeLoaderFromIndex(loader, type, ImportType.ALL);
          }
       }
    }
@@ -355,15 +355,11 @@
     * Add loader to index.
     *
     * @param loader the loader
-    * @param policy the policy
     * @param types the types
     */
-   private void addLoaderToIndex(DelegateLoader loader, BaseClassLoaderPolicy policy, ImportType... types)
+   private void addLoaderToIndex(DelegateLoader loader, ImportType... types)
    {
-      if (policy == null)
-         return;
-
-      String[] packageNames = policy.getPackageNames();
+      String[] packageNames = loader.getPackageNames();
       if (packageNames != null && packageNames.length > 0)
       {
          ClassFilter filter = loader.getFilter();
@@ -396,15 +392,11 @@
     * Remove loader from index.
     *
     * @param loader the loader
-    * @param policy the policy
     * @param types the types
     */
-   private void removeLoaderFromIndex(DelegateLoader loader, BaseClassLoaderPolicy policy, ImportType... types)
+   private void removeLoaderFromIndex(DelegateLoader loader, ImportType... types)
    {
-      if (policy == null)
-         return;
-
-      String[] packageNames = policy.getPackageNames();
+      String[] packageNames = loader.getPackageNames();
       if (packageNames != null && packageNames.length > 0)
       {
          ClassFilter filter = loader.getFilter();

Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java	2010-07-30 18:33:10 UTC (rev 107246)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/WildcardDelegateLoader.java	2010-07-30 19:21:56 UTC (rev 107247)
@@ -99,6 +99,12 @@
    }
 
    @Override
+   public String[] getPackageNames()
+   {
+      return null; // too dynamic to expose any explicit package
+   }
+
+   @Override
    protected Class<?> doLoadClass(String className)
    {
       DelegateLoader loader = resolve(ClassLoaderUtils.getClassPackageName(className));