[webbeans-commits] Webbeans SVN: r3850 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: context and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-10-05 08:18:55 -0400 (Mon, 05 Oct 2009)
New Revision: 3850

Modified:
   ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractThreadLocalMapContext.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java
Log:
explicit cleanup of threadlocals

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java	2009-10-05 10:42:37 UTC (rev 3849)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java	2009-10-05 12:18:55 UTC (rev 3850)
@@ -1429,6 +1429,7 @@
    public void cleanup()
    {
       services.cleanup();
+      this.currentInjectionPoint.remove();
    }
 
    public InterceptorRegistry<Class<?>, Interceptor> getManagedBeanInterceptorRegistry()

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java	2009-10-05 10:42:37 UTC (rev 3849)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractContext.java	2009-10-05 12:18:55 UTC (rev 3850)
@@ -86,6 +86,9 @@
       this.active.set(Boolean.valueOf(active));
    }
    
-   public abstract void cleanup();
+   public void cleanup()
+   {
+      this.active.remove();
+   }
 
 }

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java	2009-10-05 10:42:37 UTC (rev 3849)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java	2009-10-05 12:18:55 UTC (rev 3850)
@@ -174,6 +174,7 @@
    @Override
    public void cleanup()
    {
+      super.cleanup();
       if (getBeanStore() != null)
       {
          getBeanStore().clear();

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractThreadLocalMapContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractThreadLocalMapContext.java	2009-10-05 10:42:37 UTC (rev 3849)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractThreadLocalMapContext.java	2009-10-05 12:18:55 UTC (rev 3850)
@@ -62,4 +62,11 @@
       return true;
    }
    
+   @Override
+   public void cleanup()
+   {
+      super.cleanup();
+      beanStore.remove();
+   }
+   
 }
\ No newline at end of file

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java	2009-10-05 10:42:37 UTC (rev 3849)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java	2009-10-05 12:18:55 UTC (rev 3850)
@@ -91,7 +91,4 @@
       return true;
    }
 
-   @Override
-   public void cleanup() {}
-
 }