Author: struberg
Date: Wed Jul 11 15:35:59 2012
New Revision: 1360232
URL: http://svn.apache.org/viewvc?rev=1360232&view=rev
Log:
OWB-664 add missing ThreadLocal cleanup
Modified:
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
Modified:
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java?rev=1360232&r1=1360231&r2=1360232&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
(original)
+++
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
Wed Jul 11 15:35:59 2012
@@ -130,8 +130,6 @@ public class WebBeansConfigurationListen
*/
private void cleanupRequestThreadLocals()
{
- // TODO maybe there are more to cleanup
-
InjectionPointBean.removeThreadLocal();
WebContextsService.removeThreadLocals();
}
Modified:
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java?rev=1360232&r1=1360231&r2=1360232&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
(original)
+++
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
Wed Jul 11 15:35:59 2012
@@ -27,6 +27,7 @@ import org.apache.webbeans.lifecycle.Abs
import org.apache.webbeans.logger.WebBeansLogger;
import org.apache.webbeans.spi.ResourceInjectionService;
import org.apache.webbeans.spi.adaptor.ELAdaptor;
+import org.apache.webbeans.web.context.WebContextsService;
import org.apache.webbeans.web.util.ServletCompatibilityUtil;
import javax.el.ELResolver;
@@ -200,9 +201,8 @@ public final class WebContainerLifecycle
*/
private void cleanupShutdownThreadLocals()
{
- // TODO maybe there are more to cleanup
-
InjectionPointBean.removeThreadLocal();
+ WebContextsService.removeThreadLocals();
}
/**
