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

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

Author: alesj
Date: 2010-05-14 14:55:28 -0400 (Fri, 14 May 2010)
New Revision: 104810

Modified:
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/policy/WildcardClassLoaderPolicy.java
Log:
Only bounce on matching module.

Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/policy/WildcardClassLoaderPolicy.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/policy/WildcardClassLoaderPolicy.java	2010-05-14 18:50:55 UTC (rev 104809)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/policy/WildcardClassLoaderPolicy.java	2010-05-14 18:55:28 UTC (rev 104810)
@@ -218,6 +218,7 @@
    public void removeModule(Module module)
    {
       boolean sameModule = this.module == module;
+      boolean resolvedModule = false;
 
       synchronized (this)
       {
@@ -225,6 +226,7 @@
          {
             if (sameModule == false)
             {
+               resolvedModule = true; // we were part of matching modules, but not our module
                Domain md = getDomain(module);
                boolean isAncestor = (domain != md);
                if (isAncestor && domain.isParentFirst())
@@ -244,7 +246,7 @@
       }
 
       // It's not us (we're already uninstalling) and we used this, let's bounce.
-      if (used.remove(module) && sameModule == false)
+      if (resolvedModule && used.remove(module))
       {
          LifeCycle lifeCycle = this.module.getLifeCycle();
          if (lifeCycle != null && module.isCascadeShutdown() == false)