explicit cleanup of threadlocals

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@3850 1c488680-804c-0410-94cd-c6b725194a0e
weld · Oct 5, 2009 · dd53e73 · dd53e73
1 parent 0a6b971
commit dd53e73
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java b/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
@@ -1429,6 +1429,7 @@ public <T> SessionBean<T> getBean(EjbDescriptor<T> descriptor)
    public void cleanup()
    {
       services.cleanup();
+      this.currentInjectionPoint.remove();
    }
 
    public InterceptorRegistry<Class<?>, Interceptor> getManagedBeanInterceptorRegistry()

diff --git a/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java b/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java
@@ -86,6 +86,9 @@ public void setActive(boolean active)
       this.active.set(Boolean.valueOf(active));
    }
 
-   public abstract void cleanup();
+   public void cleanup()
+   {
+      this.active.remove();
+   }
 
 }
diff --git a/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java b/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java
@@ -174,6 +174,7 @@ public void destroy()
    @Override
    public void cleanup()
    {
+      super.cleanup();
       if (getBeanStore() != null)
       {
          getBeanStore().clear();

diff --git a/impl/src/main/java/org/jboss/webbeans/context/AbstractThreadLocalMapContext.java b/impl/src/main/java/org/jboss/webbeans/context/AbstractThreadLocalMapContext.java
@@ -62,4 +62,11 @@ protected boolean isCreationLockRequired()
       return true;
    }
 
+   @Override
+   public void cleanup()
+   {
+      super.cleanup();
+      beanStore.remove();
+   }
+
 }
diff --git a/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java b/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java
@@ -91,7 +91,4 @@ public boolean isActive()
       return true;
    }
 
-   @Override
-   public void cleanup() {}
-
 }