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

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

Author: alesj
Date: 2009-09-18 06:55:05 -0400 (Fri, 18 Sep 2009)
New Revision: 93677

Modified:
   projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java
Log:
Extract remove depends on me removal.

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 10:50:26 UTC (rev 93676)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java	2009-09-18 10:55:05 UTC (rev 93677)
@@ -953,23 +953,29 @@
          // TODO - we need a better way to cleanup
          Module otherModule = domain.getModule(iDependOn.toString());
          if (otherModule != null)
-         {
-            ControllerContext otherContext = otherModule.getControllerContext();
-            if (otherContext != null)
-            {
-               DependencyInfo otherDependencyInfo = otherContext.getDependencyInfo();
-               if (otherDependencyInfo != null)
-                  otherDependencyInfo.removeDependsOnMe(item);
-            }
-         }
+            otherModule.removeDependsOnMe(item);
       }
       
       // Remove the IDependOn part of this item
       DependencyInfo dependencyInfo = context.getDependencyInfo();
       dependencyInfo.removeIDependOn(item);
    }
-   
+
    /**
+    * Remove a dependency.
+    *
+    * @param item the dependency item.
+    */
+   protected void removeDependsOnMe(RequirementDependencyItem item)
+   {
+      if (context == null)
+         return;
+
+      DependencyInfo dependencyInfo = context.getDependencyInfo();
+      dependencyInfo.removeDependsOnMe(item);
+   }
+
+   /**
     * Resolve a requirement
     * 
     * @param dependency the dependency the dependency