[jboss-cvs] JBossAS SVN: r88640 - projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/lazy.

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

Author: alesj
Date: 2009-05-11 11:00:38 -0400 (Mon, 11 May 2009)
New Revision: 88640

Modified:
   projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/lazy/AbstractLazyInitializer.java
Log:
Simplify on demand change.

Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/lazy/AbstractLazyInitializer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/lazy/AbstractLazyInitializer.java	2009-05-11 14:58:04 UTC (rev 88639)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/lazy/AbstractLazyInitializer.java	2009-05-11 15:00:38 UTC (rev 88640)
@@ -101,15 +101,10 @@
             if (ControllerState.INSTALLED.equals(context.getState()) == false)
             {
                ControllerMode mode = context.getMode();
-               if (ControllerMode.ON_DEMAND.equals(mode))
+               if (ControllerMode.ON_DEMAND.equals(mode) || ControllerMode.MANUAL.equals(mode))
                {
-                  controller.enableOnDemand(context);
                   controller.change(context, ControllerState.INSTALLED);
                }
-               else if (ControllerMode.MANUAL.equals(mode))
-               {
-                  controller.change(context, ControllerState.INSTALLED);
-               }
             }
 
             if (ControllerState.INSTALLED.equals(context.getState()) == false)