[weld-commits] Weld SVN: r4195 - extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-10-19 10:52:57 -0400 (Mon, 19 Oct 2009)
New Revision: 4195

Modified:
   extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java
Log:
explicit cleanup

Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java	2009-10-19 13:15:36 UTC (rev 4194)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java	2009-10-19 14:52:57 UTC (rev 4195)
@@ -26,6 +26,11 @@
 import org.jboss.weld.bootstrap.api.Environments;
 import org.jboss.weld.context.api.BeanStore;
 import org.jboss.weld.context.api.helpers.ConcurrentHashMapBeanStore;
+import org.jboss.weld.environment.servlet.deployment.ServletDeployment;
+import org.jboss.weld.environment.servlet.services.ServletResourceInjectionServices;
+import org.jboss.weld.environment.servlet.services.ServletServicesImpl;
+import org.jboss.weld.environment.servlet.util.Reflections;
+import org.jboss.weld.environment.tomcat.WeldAnnotationProcessor;
 import org.jboss.weld.injection.spi.ResourceInjectionServices;
 import org.jboss.weld.log.Log;
 import org.jboss.weld.log.Logging;
@@ -33,11 +38,6 @@
 import org.jboss.weld.servlet.api.ServletListener;
 import org.jboss.weld.servlet.api.ServletServices;
 import org.jboss.weld.servlet.api.helpers.ForwardingServletListener;
-import org.jboss.weld.environment.servlet.deployment.ServletDeployment;
-import org.jboss.weld.environment.servlet.services.ServletResourceInjectionServices;
-import org.jboss.weld.environment.servlet.services.ServletServicesImpl;
-import org.jboss.weld.environment.servlet.util.Reflections;
-import org.jboss.weld.environment.tomcat.WeldAnnotationProcessor;
 
 /**
  * @author Pete Muir
@@ -79,6 +79,8 @@
    public void contextDestroyed(ServletContextEvent sce)
    {
       bootstrap.shutdown();
+      sce.getServletContext().removeAttribute(BeanManager.class.getName());
+      sce.getServletContext().removeAttribute(WeldAnnotationProcessor.class.getName());
       super.contextDestroyed(sce);
    }