[jboss-cvs] JBossAS SVN: r91562 - projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins.

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

Author: kabir.khan at jboss.com
Date: 2009-07-22 11:25:46 -0400 (Wed, 22 Jul 2009)
New Revision: 91562

Modified:
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
Log:
[JBKERNEL-4] A few fixes to the WIP

Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2009-07-22 15:17:59 UTC (rev 91561)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2009-07-22 15:25:46 UTC (rev 91562)
@@ -1409,10 +1409,13 @@
       finally
       {
          lockWrite();
+//         uninstallUnusedOnDemandContexts(context, trace);
       }
-//      uninstallUnusedOnDemandContexts(context, trace);
    }
-   
+
+   /**
+    * 
+    */
    protected void uninstallUnusedOnDemandContexts(ControllerContext context, boolean trace)
    {
       DependencyInfo dependencies = context.getDependencyInfo();
@@ -1426,6 +1429,9 @@
                if (item.isResolved()) //TODO Is this check necessary
                {
                   Object name = item.getIDependOn();
+                  if (name == null)
+                     continue;
+
                   ControllerContext other = getContext(name, null);
                   if (other == null)
                   {
@@ -1434,7 +1440,7 @@
                   }
                   if (other.getMode() != ControllerMode.ON_DEMAND)
                      continue;
-                  
+
                   DependencyInfo otherDependencies = other.getDependencyInfo();
                   if (otherDependencies == null)
                      continue;
@@ -1443,7 +1449,7 @@
                   boolean isRequired = false;
                   for (DependencyItem dependsOnOtherItem : dependsOnOther)
                   {
-                     ControllerContext dependsContext = getContext(item.getName(), null);
+                     ControllerContext dependsContext = getContext(dependsOnOtherItem.getName(), null);
                      if (dependsContext == null)
                      {
                         log.warn("Could not find dependency while uninstalling on demand contexts for " + item);
@@ -1461,7 +1467,6 @@
                   if (!isRequired)
                   {
                      //For some reason uninstallContext() uninstalls to the state below the passed in one, add one
-                     //TODO This should only really look at the states available to the ControllerContext
                      int index = states.indexOf(ControllerMode.ON_DEMAND.getRequiredState());
                      index++;
                      ControllerState state = states.get(index);