WELD-787 remove two thread local leaks

weld · Jan 2, 2011 · e3f241b · e3f241b
1 parent 8aba6cb
commit e3f241b
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 29 deletions.
diff --git a/...ain/java/org/jboss/weld/bean/proxy/CombinedInterceptorAndDecoratorStackMethodHandler.java b/...ain/java/org/jboss/weld/bean/proxy/CombinedInterceptorAndDecoratorStackMethodHandler.java
@@ -1,7 +1,6 @@
 package org.jboss.weld.bean.proxy;
 
 import static org.jboss.weld.bean.proxy.InterceptionDecorationContext.endInterceptorContext;
-import static org.jboss.weld.bean.proxy.InterceptionDecorationContext.getDisabledInterceptionContexts;
 import static org.jboss.weld.bean.proxy.InterceptionDecorationContext.startInterceptorContext;
 
 import java.io.Serializable;
@@ -39,7 +38,7 @@ public void setOuterDecorator(Object outerDecorator)
    private Set<CombinedInterceptorAndDecoratorStackMethodHandler> getDisabledHandlers()
    {
 
-      return getDisabledInterceptionContexts().peek();
+      return InterceptionDecorationContext.peek();
    }
 
    public Object invoke(Object self, Method thisMethod, Method proceed, Object[] args) throws Throwable
@@ -48,7 +47,7 @@ public Object invoke(Object self, Method thisMethod, Method proceed, Object[] ar
 
       try
       {
-         if (getDisabledInterceptionContexts().empty())
+         if (InterceptionDecorationContext.empty())
          {
             externalContext = true;
             startInterceptorContext();
@@ -100,7 +99,7 @@ public Object invoke(Object self, Method thisMethod, Method proceed, Object[] ar
 
    public boolean isDisabledHandler()
    {
-      if (getDisabledInterceptionContexts().empty())
+      if (InterceptionDecorationContext.empty())
       {
          return false;
       }

diff --git a/impl/src/main/java/org/jboss/weld/bean/proxy/InterceptionDecorationContext.java b/impl/src/main/java/org/jboss/weld/bean/proxy/InterceptionDecorationContext.java
@@ -17,6 +17,7 @@
 
 package org.jboss.weld.bean.proxy;
 
+import java.util.EmptyStackException;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.Stack;
@@ -36,27 +37,77 @@
  */
 public class InterceptionDecorationContext
 {
-   private static ThreadLocal<Stack<Set<CombinedInterceptorAndDecoratorStackMethodHandler>>> interceptionContexts = new ThreadLocal<Stack<Set<CombinedInterceptorAndDecoratorStackMethodHandler>>>()
+   private static ThreadLocal<Stack<Set<CombinedInterceptorAndDecoratorStackMethodHandler>>> interceptionContexts = new ThreadLocal<Stack<Set<CombinedInterceptorAndDecoratorStackMethodHandler>>>();
+
+   public static Set<CombinedInterceptorAndDecoratorStackMethodHandler> pop()
    {
-      @Override
-      protected Stack<Set<CombinedInterceptorAndDecoratorStackMethodHandler>> initialValue()
+      Stack<Set<CombinedInterceptorAndDecoratorStackMethodHandler>> stack = interceptionContexts.get();
+      if (stack == null)
       {
-         return new Stack<Set<CombinedInterceptorAndDecoratorStackMethodHandler>>();
+         throw new EmptyStackException();
       }
-   };
-
-   public static Stack<Set<CombinedInterceptorAndDecoratorStackMethodHandler>> getDisabledInterceptionContexts()
+      else
+      {
+         try
+         {
+            return stack.pop();
+         }
+         finally
+         {
+            if (stack.isEmpty())
+            {
+               interceptionContexts.remove();
+            }
+         }
+      }
+   }
+
+   public static Set<CombinedInterceptorAndDecoratorStackMethodHandler> push(Set<CombinedInterceptorAndDecoratorStackMethodHandler> item)
+   {
+      Stack<Set<CombinedInterceptorAndDecoratorStackMethodHandler>> stack = interceptionContexts.get();
+      if (stack == null)
+      {
+         stack = new Stack<Set<CombinedInterceptorAndDecoratorStackMethodHandler>>();
+         interceptionContexts.set(stack);
+      }
+      stack.push(item);
+      return item;
+   }
+
+   public static Set<CombinedInterceptorAndDecoratorStackMethodHandler> peek()
+   {
+      Stack<Set<CombinedInterceptorAndDecoratorStackMethodHandler>> stack = interceptionContexts.get();
+      if (stack == null)
+      {
+         throw new EmptyStackException();
+      }
+      else
+      {
+         return stack.peek();
+      }
+   }
+
+   public static boolean empty()
    {
-      return interceptionContexts.get();
+      Stack<Set<CombinedInterceptorAndDecoratorStackMethodHandler>> stack = interceptionContexts.get();
+      if (stack == null)
+      {
+         return true;
+      }
+      else
+      {
+         return stack.empty();
+      }
    }
+
 
    public static void endInterceptorContext()
    {
-      getDisabledInterceptionContexts().pop();
+      pop();
    }
 
    public static void startInterceptorContext()
    {
-      getDisabledInterceptionContexts().push(new HashSet<CombinedInterceptorAndDecoratorStackMethodHandler>());
+      push(new HashSet<CombinedInterceptorAndDecoratorStackMethodHandler>());
    }
 }
diff --git a/impl/src/main/java/org/jboss/weld/injection/CurrentInjectionPoint.java b/impl/src/main/java/org/jboss/weld/injection/CurrentInjectionPoint.java
@@ -16,6 +16,7 @@
  */
 package org.jboss.weld.injection;
 
+import java.util.EmptyStackException;
 import java.util.Stack;
 
 import javax.enterprise.inject.spi.InjectionPoint;
@@ -29,14 +30,7 @@ public class CurrentInjectionPoint implements Service
 
    public CurrentInjectionPoint()
    {
-      this.currentInjectionPoint = new ThreadLocal<Stack<InjectionPoint>>()
-      {
-         @Override
-         protected Stack<InjectionPoint> initialValue()
-         {
-            return new Stack<InjectionPoint>();
-         }
-      };
+      this.currentInjectionPoint = new ThreadLocal<Stack<InjectionPoint>>();
    }
 
    /**
@@ -49,12 +43,33 @@ protected Stack<InjectionPoint> initialValue()
     */
    public void push(InjectionPoint injectionPoint)
    {
-      currentInjectionPoint.get().push(injectionPoint);
+      Stack<InjectionPoint> stack = currentInjectionPoint.get();
+      if (stack == null)
+      {
+         stack = new Stack<InjectionPoint>();
+         currentInjectionPoint.set(stack);
+      }
+      stack.push(injectionPoint);
    }
 
    public InjectionPoint pop()
    {
-      return currentInjectionPoint.get().pop();
+      Stack<InjectionPoint> stack = currentInjectionPoint.get();
+      if (stack == null)
+      {
+         throw new EmptyStackException();
+      }
+      try
+      {
+         return stack.pop();
+      }
+      finally
+      {
+         if (stack.isEmpty())
+         {
+            currentInjectionPoint.remove();
+         }
+      }
    }
 
    /**
@@ -64,9 +79,14 @@ public InjectionPoint pop()
     */
    public InjectionPoint peek()
    {
-      if (!currentInjectionPoint.get().empty())
+      Stack<InjectionPoint> stack = currentInjectionPoint.get();
+      if (stack == null)
       {
-         return currentInjectionPoint.get().peek();
+         return null;
+      }
+      if (!stack.empty())
+      {
+         return stack.peek();
       }
       else
       {
@@ -76,7 +96,7 @@ public InjectionPoint peek()
 
    public void cleanup()
    {
-      this.currentInjectionPoint.remove();
+
    }
 
 }
diff --git a/impl/src/main/java/org/jboss/weld/util/collections/EmptyStack.java b/impl/src/main/java/org/jboss/weld/util/collections/EmptyStack.java
@@ -0,0 +1,8 @@
+package org.jboss.weld.util.collections;
+
+import java.util.Stack;
+
+public class EmptyStack<E> extends Stack<E>
+{
+
+}
diff --git a/...test/java/org/jboss/weld/tests/interceptors/circularInvocation/SelfInvokingClassTest.java b/...test/java/org/jboss/weld/tests/interceptors/circularInvocation/SelfInvokingClassTest.java
@@ -64,7 +64,7 @@ public void testSelfInvokingClassWithFailingBean(@Failing SomeBean someBean)
       {
          Assert.assertTrue(e instanceof UnsupportedOperationException);
       }
-      Assert.assertEquals(0, InterceptionDecorationContext.getDisabledInterceptionContexts().size());
+      Assert.assertTrue(InterceptionDecorationContext.empty());
    }
 
    @Test
@@ -80,7 +80,7 @@ public void testSelfInvokingClassWithSucceedingBean(@Succeeding SomeBean someBea
       Assert.assertEquals("methodA", SomeBeanDecorator.calls.get(0));
       Assert.assertEquals("methodB", SomeBeanDecorator.calls.get(1));
 
-      Assert.assertEquals(0, InterceptionDecorationContext.getDisabledInterceptionContexts().size());
+      Assert.assertTrue(InterceptionDecorationContext.empty());
    }
 
 }
diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/resources/ResourceTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/resources/ResourceTest.java
@@ -16,6 +16,10 @@
  */
 package org.jboss.weld.tests.resources;
 
+import static org.junit.Assert.assertNotNull;
+
+import javax.transaction.UserTransaction;
+
 import org.jboss.arquillian.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;