[jboss-cvs] JBossAS SVN: r95908 - in projects/kernel/trunk/kernel/src: test/java/org/jboss/test/kernel/controller/test and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2009-11-02 05:18:17 -0500 (Mon, 02 Nov 2009)
New Revision: 95908

Modified:
   projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelController.java
   projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/controller/test/ControllerTestSuite.java
Log:
Move CSM.addState() into an abstract base class since callers of Controller.getState() should not be able to add states. Adding states should happen via controller

Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelController.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelController.java	2009-11-02 10:17:17 UTC (rev 95907)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelController.java	2009-11-02 10:18:17 UTC (rev 95908)
@@ -156,7 +156,7 @@
       ControllerContext context = super.getContext(name, state);
       if (context != null)
          return context;
-      if (state == null || ControllerState.INSTALLED.equals(state))
+      if (state == null || ControllerState.INSTALLED.equals(state) || getStates().isAfterState(state, ControllerState.INSTALLED))
       {
          org.jboss.kernel.spi.registry.KernelRegistry registry = kernel.getRegistry();
          try

Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/controller/test/ControllerTestSuite.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/controller/test/ControllerTestSuite.java	2009-11-02 10:17:17 UTC (rev 95907)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/controller/test/ControllerTestSuite.java	2009-11-02 10:18:17 UTC (rev 95908)
@@ -50,6 +50,7 @@
       suite.addTest(InstallWhenRequiredErrorTestCase.suite());
       suite.addTest(FieldAccessControlTestCase.suite());
       suite.addTest(GenericBeanFactoryAccessControlTestCase.suite());
+      suite.addTest(StateAfterInstalledTestCase.suite());
       
       return suite;
    }