[jboss-cvs] JBossAS SVN: r108117 - trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2010-09-13 04:33:46 -0400 (Mon, 13 Sep 2010)
New Revision: 108117

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
Log:
- Add some component push/pop arount context start/stop. Should move to NamingListener, but the appropriate hooks are missing.

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2010-09-12 12:42:26 UTC (rev 108116)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2010-09-13 08:33:46 UTC (rev 108117)
@@ -36,6 +36,7 @@
 import org.jboss.metadata.web.spec.TldMetaData;
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.naming.NonSerializableFactory;
+import org.jboss.reloaded.naming.CurrentComponent;
 import org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer;
 import org.jboss.reloaded.naming.spi.JavaEEComponent;
 import org.jboss.reloaded.naming.spi.JavaEEModule;
@@ -295,6 +296,8 @@
       JBossContextConfig.deploymentUnitLocal.set(unit);
       try
       {
+         // JBAS-8406: Temp hack, will move to NamingListener
+         CurrentComponent.push(component);
          // Start it
          context.start();
          // Build the ENC
@@ -314,6 +317,8 @@
 
          JBossContextConfig.kernelLocal.set(null);
          JBossContextConfig.deploymentUnitLocal.set(null);
+         // JBAS-8406: Temp hack, will move to NamingListener
+         CurrentComponent.pop();
       }
       if (context.getState() != 1)
       {
@@ -539,8 +544,17 @@
 
       if (server.isRegistered(objectName))
       {
-         // Contexts should be stopped by the host already
-         server.invoke(objectName, "destroy", new Object[] {}, new String[] {});
+         try
+         {
+            // JBAS-8406: Temp hack, will move to NamingListener
+            CurrentComponent.push(component);
+            // Contexts should be stopped by the host already
+            server.invoke(objectName, "destroy", new Object[] {}, new String[] {});
+         }
+         finally
+         {
+            CurrentComponent.pop();
+         }
       }
    }