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

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

Author: alesj
Date: 2010-02-09 08:27:35 -0500 (Tue, 09 Feb 2010)
New Revision: 100748

Modified:
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
Log:
Small trace log fix.

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	2010-02-09 13:27:11 UTC (rev 100747)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2010-02-09 13:27:35 UTC (rev 100748)
@@ -1087,13 +1087,16 @@
          for (ControllerState state : stateModel)
          {
             ControllerState nextState = stateModel.getNextState(state);
-            Set<ControllerContext> stillUnresolved = getContextsByState(state);
-            if (stillUnresolved.isEmpty() == false)
+            if (stateModel.isValidState(nextState)) // only check states with valid next state
             {
-               for (ControllerContext ctx : stillUnresolved)
+               Set<ControllerContext> stillUnresolved = getContextsByState(state);
+               if (stillUnresolved != null && stillUnresolved.isEmpty() == false)
                {
-                  if (advance(ctx))
-                     log.trace("Still unresolved " + nextState.getStateString() + ": " + ctx);
+                  for (ControllerContext ctx : stillUnresolved)
+                  {
+                     if (advance(ctx))
+                        log.trace("Still unresolved " + nextState.getStateString() + ": " + ctx);
+                  }
                }
             }
          }