[jboss-cvs] JBossAS SVN: r99655 - projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver.

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

Author: kabir.khan at jboss.com
Date: 2010-01-20 07:25:54 -0500 (Wed, 20 Jan 2010)
New Revision: 99655

Modified:
   projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/IndexingDependencyResolver2.java
Log:
Support ControllerMode.DISABLED

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-20 12:12:26 UTC (rev 99654)
+++ projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/IndexingDependencyResolver2.java	2010-01-20 12:25:54 UTC (rev 99655)
@@ -36,8 +36,6 @@
 import org.jboss.dependency.spi.DependencyInfo;
 import org.jboss.dependency.spi.DependencyItem;
 
-import com.sun.org.apache.bcel.internal.generic.ALOAD;
-
 /**
  * Optimized  
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
@@ -126,16 +124,26 @@
       while (getStateModel().isAfterState(toState, fromState))
       {
          ControllerState nextState = getStateModel().getNextState(fromState);
-         if (plugin.canMoveToState(context, nextState))
+         
+         if (checkCanInstall(context, fromState, nextState, trace) == false)
+            break;
+         try
          {
-            if (incrementState(context, trace))
-               fromState = context.getState();
+            if (plugin.canMoveToState(context, nextState))
+            {
+               if (incrementState(context, trace))
+                  fromState = context.getState();
+               else
+                  break;
+            }
             else
+            {
                break;
+            }
          }
-         else
+         finally
          {
-            break;
+            removeInstalling(context);
          }
       }
    }