[jboss-cvs] JBossAS SVN: r96575 - projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency.

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

Author: alesj
Date: 2009-11-19 10:10:32 -0500 (Thu, 19 Nov 2009)
New Revision: 96575

Modified:
   projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/LifeCycle.java
Log:
Use controller state model.

Modified: projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/LifeCycle.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/LifeCycle.java	2009-11-19 15:05:56 UTC (rev 96574)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/LifeCycle.java	2009-11-19 15:10:32 UTC (rev 96575)
@@ -25,8 +25,10 @@
 import org.jboss.classloader.spi.ClassFoundHandler;
 import org.jboss.classloader.spi.ClassLoaderPolicy;
 import org.jboss.classloading.spi.dependency.policy.ClassLoaderPolicyModule;
+import org.jboss.dependency.spi.Controller;
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.ControllerStateModel;
 import org.jboss.logging.Logger;
 
 /**
@@ -154,7 +156,10 @@
       ControllerContext context = module.getControllerContext();
       if (context == null)
          return false;
-      return ControllerState.INSTALLED.equals(context.getState());
+
+      Controller controller = context.getController();
+      ControllerStateModel model = controller.getStates();
+      return model.isBeforeState(context.getState(), ControllerState.INSTALLED) == false;
    }
    
    /**