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

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

Author: alesj
Date: 2007-08-07 09:20:17 -0400 (Tue, 07 Aug 2007)
New Revision: 64483

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java
Log:
Fix - setting the underlying controller at the right time.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java	2007-08-07 12:24:17 UTC (rev 64482)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java	2007-08-07 13:20:17 UTC (rev 64483)
@@ -195,12 +195,12 @@
          }
          ScopedKernelController scopedController = controllerItem.getValue();
          scopedController.removeControllerContext(context);
+         context.setController(scopedController.getUnderlyingController());
          if (scopedController.isActive() == false)
          {
             try
             {
                ((MutableMetaData)mdr).removeMetaData(ScopedKernelController.class);
-               context.setController(scopedController.getUnderlyingController());
             }
             finally
             {