[jboss-cvs] JBossAS SVN: r93672 - projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency.

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

Author: thomas.diesler at jboss.com
Date: 2009-09-18 04:42:23 -0400 (Fri, 18 Sep 2009)
New Revision: 93672

Modified:
   projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java
Log:
[JBCL-119] DependencyInfo.removeDependsOnMe never called

Modified: projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java	2009-09-18 07:38:19 UTC (rev 93671)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java	2009-09-18 08:42:23 UTC (rev 93672)
@@ -57,6 +57,7 @@
 import org.jboss.classloading.spi.visitor.ResourceVisitor;
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.DependencyInfo;
 
 /**
  * Module.
@@ -944,7 +945,19 @@
    {
       if (context == null)
          throw new IllegalStateException("No controller context");
-      context.getDependencyInfo().removeIDependOn(item);
+      
+      // Remove the DependsOnMe part of this item
+      Object iDependOn = item.getIDependOn();
+      if (iDependOn != null)
+      {
+         Module otherModule = domain.getModule(iDependOn.toString());
+         DependencyInfo otherDependencyInfo = otherModule.getControllerContext().getDependencyInfo();
+         otherDependencyInfo.removeDependsOnMe(item);
+      }
+      
+      // Remove the IDependOn part of this item
+      DependencyInfo dependencyInfo = context.getDependencyInfo();
+      dependencyInfo.removeIDependOn(item);
    }
    
    /**