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

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

Author: kabir.khan at jboss.com
Date: 2010-01-25 06:45:39 -0500 (Mon, 25 Jan 2010)
New Revision: 99898

Modified:
   projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/IndexingDependencyResolver.java
Log:
Fix RedeployAfterErrorTestCase

Modified: projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/IndexingDependencyResolver.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/IndexingDependencyResolver.java	2010-01-25 11:42:38 UTC (rev 99897)
+++ projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/IndexingDependencyResolver.java	2010-01-25 11:45:39 UTC (rev 99898)
@@ -164,35 +164,38 @@
    {
       ControllerState fromState = context.getState();      
       
-      while (getStateModel().isAfterState(context.getRequiredState(), fromState))
+      if (getStateModel().isValidState(fromState))
       {
-         ControllerState nextState = getStateModel().getNextState(fromState);
-         
-         if (checkCanInstall(context, fromState, nextState, trace) == false)
-            break;
-         try
+         while (getStateModel().isAfterState(context.getRequiredState(), fromState))
          {
-            checkAndEnableOnDemandForContext(context, trace);
-            if (canMoveToState(context, nextState))
+            ControllerState nextState = getStateModel().getNextState(fromState);
+            
+            if (checkCanInstall(context, fromState, nextState, trace) == false)
+               break;
+            try
             {
-               if (incrementState(context, trace))
-                  fromState = context.getState();
+               checkAndEnableOnDemandForContext(context, trace);
+               if (canMoveToState(context, nextState))
+               {
+                  if (incrementState(context, trace))
+                     fromState = context.getState();
+                  else
+                     break;
+               }
                else
+               {
                   break;
+               }
             }
-            else
+            catch(Throwable t)
             {
-               break;
+               errorResolvingContext(context, fromState, nextState, t, trace);
             }
+            finally
+            {
+               removeInstalling(context);
+            }
          }
-         catch(Throwable t)
-         {
-            errorResolvingContext(context, fromState, nextState, t, trace);
-         }
-         finally
-         {
-            removeInstalling(context);
-         }
       }
       
       while (true)