[jboss-cvs] JBossAS SVN: r104835 - projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/wildcard.

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

Author: alesj
Date: 2010-05-16 08:06:37 -0400 (Sun, 16 May 2010)
New Revision: 104835

Modified:
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/wildcard/WildcardClassLoaderPolicy.java
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/wildcard/WildcardClassLoaderPolicyFactory.java
Log:
Make sure we don't miss some module.

Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/wildcard/WildcardClassLoaderPolicy.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/wildcard/WildcardClassLoaderPolicy.java	2010-05-16 03:51:27 UTC (rev 104834)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/wildcard/WildcardClassLoaderPolicy.java	2010-05-16 12:06:37 UTC (rev 104835)
@@ -91,7 +91,15 @@
       this.requirement = pr;
       this.module = item.getModule();
 
-      fillModules(domain);
+      ClassLoading classLoading = domain.getClassLoading();      
+      synchronized (this)
+      {
+         // Make sure we don't miss some Module
+         // hence installing listener before doing the initial scan
+         classLoading.addModuleRegistry(this);
+         // Find existing matching modules
+         fillModules(domain);
+      }
    }
 
    /**

Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/wildcard/WildcardClassLoaderPolicyFactory.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/wildcard/WildcardClassLoaderPolicyFactory.java	2010-05-16 03:51:27 UTC (rev 104834)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/wildcard/WildcardClassLoaderPolicyFactory.java	2010-05-16 12:06:37 UTC (rev 104835)
@@ -23,7 +23,6 @@
 
 import org.jboss.classloader.spi.ClassLoaderPolicy;
 import org.jboss.classloader.spi.ClassLoaderPolicyFactory;
-import org.jboss.classloading.spi.dependency.ClassLoading;
 import org.jboss.classloading.spi.dependency.Domain;
 import org.jboss.classloading.spi.dependency.RequirementDependencyItem;
 
@@ -59,9 +58,6 @@
 
    public ClassLoaderPolicy createClassLoaderPolicy()
    {
-      WildcardClassLoaderPolicy policy = new WildcardClassLoaderPolicy(domain, item);
-      ClassLoading classLoading = domain.getClassLoading();
-      classLoading.addModuleRegistry(policy); // so we know when to reset on module change
-      return policy;
+      return new WildcardClassLoaderPolicy(domain, item);
    }
 }
\ No newline at end of file