Fixing broken decorator test. Non-decorated calls are now redirected …

…correctly to the contextual instance.
weld · Nov 6, 2009 · a07497b · a07497b
1 parent 5fce629
commit a07497b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java b/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
@@ -94,6 +94,9 @@ public abstract class AbstractClassBean<T> extends AbstractBean<T, Class<T>>
    private Class<T> proxyClassForDecorators;
 
    private final ThreadLocal<Integer> decoratorStackPosition;
+
+   private final ThreadLocal<T> decoratedActualInstance = new ThreadLocal<T>();
+
    private WeldMethod<?, ?> postConstruct;
    private WeldMethod<?, ?> preDestroy;
 
@@ -178,6 +181,11 @@ protected T applyDecorators(T instance, CreationalContext<T> creationalContext,
       List<SerializableContextualInstance<DecoratorImpl<Object>, Object>> decoratorInstances = new ArrayList<SerializableContextualInstance<DecoratorImpl<Object>,Object>>();
       InjectionPoint ip = originalInjectionPoint;
       boolean outside = decoratorStackPosition.get().intValue() == 0;
+      if (outside)
+      {
+         decoratedActualInstance.set(instance);
+      }
+
       try
       {
          int i = decoratorStackPosition.get();
@@ -211,7 +219,10 @@ protected T applyDecorators(T instance, CreationalContext<T> creationalContext,
       try
       {
          T proxy = proxyClassForDecorators.newInstance();
-         ((ProxyObject) proxy).setHandler(new DecoratorProxyMethodHandler(decoratorInstances, instance));
+         // temporary fix for decorators - make sure that the instance wrapped by the decorators
+         // is the contextual instance
+         // TODO - correct the decoration algorithm to avoid the creation of new target class instances
+         ((ProxyObject) proxy).setHandler(new DecoratorProxyMethodHandler(decoratorInstances, decoratedActualInstance.get()));
          return proxy;
       }
       catch (InstantiationException e)
@@ -222,6 +233,13 @@ protected T applyDecorators(T instance, CreationalContext<T> creationalContext,
       {
          throw new RuntimeException("Could not access bean correctly when creating decorator proxy for " + toString(), e);
       }
+      finally
+      {
+         if (outside)
+         {
+            decoratedActualInstance.set(null);
+         }
+      }
    }
 
    public List<Decorator<?>> getDecorators()

diff --git a/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java b/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java
@@ -14,7 +14,7 @@
 @BeansXml("beans.xml")
 public class SimpleDecoratorTest extends AbstractWeldTest
 {
-   @Test(groups = "broken")
+   @Test
    public void testSimpleDecorator()
    {
       SimpleBean simpleBean = getCurrentManager().getInstanceByType(SimpleBean.class);