[jboss-cvs] JBossAS SVN: r99604 - in projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins: resolver and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2010-01-19 14:14:16 -0500 (Tue, 19 Jan 2010)
New Revision: 99604

Modified:
   projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyResolver.java
   projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/IndexingDependencyResolver2.java
Log:
Null DependencyItem.getDependentState() should be read as INSTALLED

Modified: projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyResolver.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyResolver.java	2010-01-19 18:53:33 UTC (rev 99603)
+++ projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyResolver.java	2010-01-19 19:14:16 UTC (rev 99604)
@@ -27,6 +27,7 @@
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.dependency.spi.ControllerStateModel;
+import org.jboss.dependency.spi.DependencyItem;
 import org.jboss.logging.Logger;
 
 /**
@@ -135,6 +136,15 @@
       }
    }
    
+   protected ControllerState getDependentState(DependencyItem item)
+   {
+      if (item.getDependentState() == null)
+         return ControllerState.INSTALLED;
+      
+      return item.getDependentState();
+   }
+   
+   
    public abstract void resolveContexts(ControllerContext context, boolean trace);
    
    public abstract boolean resolveDependencies(ControllerContext ctx, ControllerState state);

Modified: projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/IndexingDependencyResolver2.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/IndexingDependencyResolver2.java	2010-01-19 18:53:33 UTC (rev 99603)
+++ projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/IndexingDependencyResolver2.java	2010-01-19 19:14:16 UTC (rev 99604)
@@ -73,11 +73,11 @@
                   if (old != null)
                      contextsByState = old;
                }
-               List<ControllerContext> contexts = contextsByState.get(item.getDependentState());
+               List<ControllerContext> contexts = contextsByState.get(getDependentState(item));
                if (contexts == null)
                {
                   contexts = new CopyOnWriteArrayList<ControllerContext>();
-                  List<ControllerContext> old = contextsByState.putIfAbsent(item.getDependentState(), contexts);
+                  List<ControllerContext> old = contextsByState.putIfAbsent(getDependentState(item), contexts);
                   if (old != null)
                      contexts = old;
                }
@@ -104,7 +104,7 @@
                ConcurrentMap<ControllerState, List<ControllerContext>> contextsByState = contextsByDependency.get(name);
                if (contextsByState == null)
                   throw new IllegalStateException("Inconsistent state");
-               List<ControllerContext> contexts = contextsByState.get(item.getDependentState());
+               List<ControllerContext> contexts = contextsByState.get(getDependentState(item));
                if (contexts == null)
                   throw new IllegalStateException("Inconsistent state");
                if (!contexts.remove(context))