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

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

Author: wolfc
Date: 2010-08-24 05:26:42 -0400 (Tue, 24 Aug 2010)
New Revision: 107758

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/NamingListener.java
Log:
JBAS-7862: establish java:comp on init & destroy

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/NamingListener.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/NamingListener.java	2010-08-24 06:32:21 UTC (rev 107757)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/NamingListener.java	2010-08-24 09:26:42 UTC (rev 107758)
@@ -61,14 +61,18 @@
       String type = event.getType();
       // Push the identity on the before init/destroy
       if ( type.equals(InstanceEvent.BEFORE_REQUEST_EVENT)
-         || type.equals(InstanceEvent.BEFORE_DISPATCH_EVENT) )
+         || type.equals(InstanceEvent.BEFORE_DISPATCH_EVENT)
+         || type.equals(InstanceEvent.BEFORE_DESTROY_EVENT)
+         || type.equals(InstanceEvent.BEFORE_INIT_EVENT) )
       {
          // Push naming id
          CurrentComponent.push(id);
       }
       // Pop the identity on the after init/destroy
       else if ( type.equals(InstanceEvent.AFTER_REQUEST_EVENT)
-         || type.equals(InstanceEvent.AFTER_DISPATCH_EVENT) )
+         || type.equals(InstanceEvent.AFTER_DISPATCH_EVENT)
+         || type.equals(InstanceEvent.AFTER_DESTROY_EVENT)
+         || type.equals(InstanceEvent.AFTER_INIT_EVENT) )
       {
          // Pop naming id
          CurrentComponent.pop();