WELD-1513 Handle circular dependency for non-trivial combination of

managed beans and producers
weld · Nov 29, 2013 · 140c1ac · 140c1ac
1 parent de440bc
commit 140c1ac
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/context/CreationalContextImpl.java b/impl/src/main/java/org/jboss/weld/context/CreationalContextImpl.java
@@ -89,6 +89,10 @@ public <S> CreationalContextImpl<S> getCreationalContext(Contextual<S> contextua
         return new CreationalContextImpl<S>(contextual, incompleteInstances, dependentInstances, this);
     }
 
+    public <S> CreationalContextImpl<S> getProducerReceiverCreationalContext(Contextual<S> contextual) {
+        return new CreationalContextImpl<S>(contextual, incompleteInstances, Collections.synchronizedList(new ArrayList<ContextualInstance<?>>()), null);
+    }
+
     public <S> S getIncompleteInstance(Contextual<S> bean) {
         return incompleteInstances == null ? null : Reflections.<S>cast(incompleteInstances.get(bean));
     }

diff --git a/impl/src/main/java/org/jboss/weld/context/WeldCreationalContext.java b/impl/src/main/java/org/jboss/weld/context/WeldCreationalContext.java
@@ -30,7 +30,16 @@
  */
 public interface WeldCreationalContext<T> extends org.jboss.weld.construction.api.WeldCreationalContext<T> {
 
-    <S> WeldCreationalContext<S> getCreationalContext(Contextual<S> Contextual);
+    <S> WeldCreationalContext<S> getCreationalContext(Contextual<S> contextual);
+
+    /**
+     * The returned {@link CreationalContext} shares nothing but incomplete instances.
+     *
+     * @param contextual
+     * @return the {@link CreationalContext} for a producer reciever
+     * @see WELD-1513
+     */
+    <S> WeldCreationalContext<S> getProducerReceiverCreationalContext(Contextual<S> contextual);
 
     <S> S getIncompleteInstance(Contextual<S> bean);
 

diff --git a/impl/src/main/java/org/jboss/weld/injection/producer/AbstractMemberProducer.java b/impl/src/main/java/org/jboss/weld/injection/producer/AbstractMemberProducer.java
@@ -143,7 +143,8 @@ public void dispose(T instance) {
 
     @Override
     public T produce(CreationalContext<T> ctx) {
-        CreationalContext<X> receiverCreationalContext = getBeanManager().createCreationalContext(getDeclaringBean());
+
+        CreationalContext<X> receiverCreationalContext = getReceiverCreationalContext(ctx);
         Object receiver = getReceiver(ctx, receiverCreationalContext);
 
         try {
@@ -153,6 +154,14 @@ public T produce(CreationalContext<T> ctx) {
         }
     }
 
+    private CreationalContext<X> getReceiverCreationalContext(CreationalContext<T> ctx) {
+        if(ctx instanceof WeldCreationalContext) {
+            return ((WeldCreationalContext<?>)ctx).getProducerReceiverCreationalContext(getDeclaringBean());
+        } else {
+            return getBeanManager().createCreationalContext(getDeclaringBean());
+        }
+    }
+
     public DisposalMethod<?, ?> getDisposalMethod() {
         return disposalMethod;
     }

diff --git a/...g/jboss/weld/tests/producer/method/circular/weld1513/NonTrivialCircularInjectionTest.java b/...g/jboss/weld/tests/producer/method/circular/weld1513/NonTrivialCircularInjectionTest.java
@@ -23,12 +23,10 @@
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.BeanArchive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(Arquillian.class)
-@Ignore("WELD-1513")
 public class NonTrivialCircularInjectionTest {
 
     @Inject