You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/03/19 13:43:43 UTC

svn commit: r1302398 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebBeansListener.java

Author: rmannibucau
Date: Mon Mar 19 12:43:42 2012
New Revision: 1302398

URL: http://svn.apache.org/viewvc?rev=1302398&view=rev
Log:
TOMEE-155 @Disposes method was not invoked for RequestScoped beans

Modified:
    openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebBeansListener.java

Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebBeansListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebBeansListener.java?rev=1302398&r1=1302397&r2=1302398&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebBeansListener.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebBeansListener.java Mon Mar 19 12:43:42 2012
@@ -24,7 +24,6 @@ import org.apache.webbeans.config.WebBea
 import org.apache.webbeans.conversation.ConversationManager;
 import org.apache.webbeans.el.ELContextStore;
 import org.apache.webbeans.logger.WebBeansLogger;
-import org.apache.webbeans.spi.ContainerLifecycle;
 import org.apache.webbeans.spi.FailOverService;
 import org.apache.webbeans.util.WebBeansUtil;
 import org.apache.webbeans.web.context.WebContextsService;
@@ -58,7 +57,6 @@ public class WebBeansListener implements
     /**
      * Manages the container lifecycle
      */
-    protected ContainerLifecycle lifeCycle = null;
     protected WebBeansContext webBeansContext;
 
     /**
@@ -100,11 +98,9 @@ public class WebBeansListener implements
                 elStore.destroyELContextStore();
             }
 
-            if (this.lifeCycle != null) {
-                this.lifeCycle.getContextService().endContext(RequestScoped.class, event);
-            }
 
-            this.cleanupRequestThreadLocals();
+            webBeansContext.getContextsService().endContext(RequestScoped.class, event);
+            cleanupRequestThreadLocals();
         } finally {
             ThreadSingletonServiceImpl.enter((WebBeansContext) oldContext);
         }