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

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

Author: kabir.khan at jboss.com
Date: 2010-01-15 09:02:43 -0500 (Fri, 15 Jan 2010)
New Revision: 99475

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/DefaultDependencyResolver.java
Log:
Simplify as Ales did in trunk

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-15 13:39:24 UTC (rev 99474)
+++ projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/AbstractDependencyResolver.java	2010-01-15 14:02:43 UTC (rev 99475)
@@ -128,17 +128,10 @@
    
    protected void resolveParentController(boolean trace)
    {
-      Controller parent = controller.getParentController();
+      AbstractController parent = controller.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);
       }
    }
    

Modified: projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/DefaultDependencyResolver.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/DefaultDependencyResolver.java	2010-01-15 13:39:24 UTC (rev 99474)
+++ projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/DefaultDependencyResolver.java	2010-01-15 14:02:43 UTC (rev 99475)
@@ -93,7 +93,6 @@
       
       if (wasOnDemandEnabled)
       {
-         wasOnDemandEnabled = false;
          resolveParentController(trace);
       }
    }