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

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

Author: kabir.khan at jboss.com
Date: 2006-11-15 12:15:29 -0500 (Wed, 15 Nov 2006)
New Revision: 58411

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ConfigureAction.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstantiateAction.java
Log:
Move call to KernelControllerContextAware.set/unsetKernelControllerContext() from InstantiateAction to ConfigureAction

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ConfigureAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ConfigureAction.java	2006-11-15 17:06:05 UTC (rev 58410)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ConfigureAction.java	2006-11-15 17:15:29 UTC (rev 58411)
@@ -31,6 +31,7 @@
 import org.jboss.kernel.spi.config.KernelConfigurator;
 import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
 
 /**
  * ConfigureAction.
@@ -51,6 +52,10 @@
       BeanMetaData metaData = context.getBeanMetaData();
       Set joinPoints = configurator.getPropertySetterJoinPoints(info, metaData);
       setAttributes(context, object, joinPoints, false);
+      
+      if (object instanceof KernelControllerContextAware)
+         ((KernelControllerContextAware) object).setKernelControllerContext(context);
+
    }
 
    public void uninstallAction(KernelControllerContext context)
@@ -60,6 +65,21 @@
       KernelConfigurator configurator = kernel.getConfigurator();
 
       Object object = context.getTarget();
+
+      try
+      {
+         if (object != null)
+         {
+            if (object instanceof KernelControllerContextAware)
+               ((KernelControllerContextAware) object).unsetKernelControllerContext(context);
+         }
+      }
+      catch (Throwable ignored)
+      {
+         log.debug("Ignored error unsetting context ", ignored);
+      }
+      
+      
       BeanInfo info = context.getBeanInfo();
       BeanMetaData metaData = context.getBeanMetaData();
       try

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstantiateAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstantiateAction.java	2006-11-15 17:06:05 UTC (rev 58410)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstantiateAction.java	2006-11-15 17:15:29 UTC (rev 58411)
@@ -68,8 +68,8 @@
                context.setBeanInfo(info);
             }
 
-            if (object instanceof KernelControllerContextAware)
-               ((KernelControllerContextAware) object).setKernelControllerContext(context);
+//            if (object instanceof KernelControllerContextAware)
+//               ((KernelControllerContextAware) object).setKernelControllerContext(context);
 
             controller.addInstantiatedContext(context);
          }
@@ -88,8 +88,8 @@
          Object object = context.getTarget();
          if (object != null)
          {
-            if (object instanceof KernelControllerContextAware)
-               ((KernelControllerContextAware) object).unsetKernelControllerContext(context);
+//            if (object instanceof KernelControllerContextAware)
+//               ((KernelControllerContextAware) object).unsetKernelControllerContext(context);
 
             KernelController controller = (KernelController) context.getController();
             controller.removeInstantiatedContext(context);