Fix test, do not keep dependent beans as incomplete.

weld · Mar 9, 2012 · 70a5a96 · 70a5a96
1 parent 62a94da
commit 70a5a96
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java b/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
@@ -133,7 +133,10 @@ public T produce(final CreationalContext<T> ctx) {
                 // Without this, the chaining of decorators will fail as the
                 // incomplete instance will be resolved
                 instance = bean.createInstance(ctx);
-                ctx.push(instance);
+                // Do not keep dependent instances as incomplete
+                if (bean.isDependent() == false) {
+                    ctx.push(instance);
+                }
             } else {
                 T undecoratedInstance = bean.createInstance(ctx);
                 instance = bean.applyDecorators(undecoratedInstance, ctx, Container.instance().services().get(CurrentInjectionPoint.class).peek());

diff --git a/impl/src/main/java/org/jboss/weld/context/WeldCreationalContext.java b/impl/src/main/java/org/jboss/weld/context/WeldCreationalContext.java
@@ -29,8 +29,6 @@
  */
 public interface WeldCreationalContext<T> extends CreationalContext<T> {
 
-    void push(T incompleteInstance);
-
     <S> WeldCreationalContext<S> getCreationalContext(Contextual<S> Contextual);
 
     <S> S getIncompleteInstance(Contextual<S> bean);

diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/resolution/weld911/BarImpl.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/resolution/weld911/BarImpl.java
@@ -17,10 +17,13 @@
 
 package org.jboss.weld.tests.resolution.weld911;
 
+import javax.enterprise.context.RequestScoped;
+
 /**
  * @author Christian Bauer
  * @author <a href="mailto:ales.justin@jboss.org">Ales Justin</a>
  */
+@RequestScoped
 public class BarImpl implements Bar {
     public Foo foo() {
         return null;

diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/resolution/weld911/Foo.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/resolution/weld911/Foo.java
@@ -25,6 +25,10 @@
  * @author <a href="mailto:ales.justin@jboss.org">Ales Justin</a>
  */
 public class Foo {
+    public Foo() {
+        System.out.println("CTOR FOO");
+    }
+
     @PostConstruct
     void init() {
         System.out.println("INIT FOO");