[jboss-cvs] JBossAS SVN: r104827 - 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-15 15:35:12 -0400 (Sat, 15 May 2010)
New Revision: 104827

Modified:
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/wildcard/WildcardClassLoaderPolicy.java
Log:
Remove reset for module addition.

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-15 15:21:04 UTC (rev 104826)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/wildcard/WildcardClassLoaderPolicy.java	2010-05-15 19:35:12 UTC (rev 104827)
@@ -40,6 +40,8 @@
 /**
  * WildcardClassLoaderPolicy.
  *
+ * TODO -- lookup order might be wrong when some Module's are resolved lazily.
+ *
  * @author <a href="ales.justin at jboss.org">Ales Justin</a>
  */
 public class WildcardClassLoaderPolicy extends ClassLoaderPolicy implements ModuleRegistry
@@ -240,8 +242,6 @@
             boolean isParentFirst = domain.isParentFirst();
             addModule(current, isAncestor, isParentFirst);
          }
-
-         reset();
       }
    }
 
@@ -304,19 +304,17 @@
       if (resolvedModule && used.remove(current))
       {
          LifeCycle lifeCycle = module.getLifeCycle();
-         if (lifeCycle != null)
+         // Non-cascade is updated / bounced via refresh
+         if (lifeCycle != null && current.isCascadeShutdown())
          {
-            if (current.isCascadeShutdown())
+            try
             {
-               try
-               {
-                  lifeCycle.bounce(); // let's refresh the wired resources
-               }
-               catch (Exception e)
-               {
-                  throw new RuntimeException("Error bouncing module: " + this.module, e);
-               }
+               lifeCycle.bounce(); // let's refresh the wired resources
             }
+            catch (Exception e)
+            {
+               throw new RuntimeException("Error bouncing module: " + this.module, e);
+            }
          }
       }
    }