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

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

Author: alesj
Date: 2010-01-15 06:21:07 -0500 (Fri, 15 Jan 2010)
New Revision: 99454

Modified:
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
Log:
Simplify a bit.

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-01-15 11:07:23 UTC (rev 99453)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2010-01-15 11:21:07 UTC (rev 99454)
@@ -1058,12 +1058,13 @@
    protected void resolveContexts(boolean trace)
    {
       boolean wasOnDemandEnabled = false;
+
       boolean resolutions = true;
       while (resolutions || onDemandEnabled)
       {
          if (onDemandEnabled)
-            wasOnDemandEnabled = true
-            ;
+            wasOnDemandEnabled = true;
+
          onDemandEnabled = false;
          resolutions = false;
          for (ControllerState fromState : stateModel)
@@ -1110,18 +1111,10 @@
       
       if (wasOnDemandEnabled)
       {
-         wasOnDemandEnabled = false;
-         Controller parent = getParentController();
+         AbstractController parent = getParentController();
          if (parent != null)
          {
-            if (parent instanceof AbstractController == false)
-            {
-               log.warn("Parent is not an instance of AbstractController");
-            }
-            else
-            {
-               ((AbstractController)parent).resolveContexts(trace);
-            }
+            parent.resolveContexts(trace);
          }
       }
    }