[jboss-cvs] JBossAS SVN: r104809 - 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:50:55 -0400 (Fri, 14 May 2010)
New Revision: 104809

Modified:
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/policy/WildcardClassLoaderPolicy.java
Log:
Exclude domain check for our module at uninstall.

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 17:45:53 UTC (rev 104808)
+++ 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)
@@ -217,21 +217,24 @@
 
    public void removeModule(Module module)
    {
+      boolean sameModule = this.module == module;
+
       synchronized (this)
       {
          if (modules.remove(module))
          {
-            Domain md = getDomain(module);
-            boolean isAncestor = (domain != md);
-            if (isAncestor && domain.isParentFirst())
-               parentsBefore--;
+            if (sameModule == false)
+            {
+               Domain md = getDomain(module);
+               boolean isAncestor = (domain != md);
+               if (isAncestor && domain.isParentFirst())
+                  parentsBefore--;
 
+            }
             reset();
          }
       }
 
-      boolean sameModule = this.module == module;
-
       // Unregister this policy as module listener
       if (sameModule)
       {