WELD-1820 Minor fix

weld · Mar 6, 2015 · 5aa31d0 · 5aa31d0
1 parent b17c5e8
commit 5aa31d0
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/bean/ContextualInstanceStrategy.java b/impl/src/main/java/org/jboss/weld/bean/ContextualInstanceStrategy.java
@@ -120,7 +120,10 @@ T getIfExists(Bean<T> bean, BeanManagerImpl manager) {
             }
             synchronized (this) {
                 if (value == null) {
-                    this.value = instance = super.getIfExists(bean, manager);
+                    instance = super.getIfExists(bean, manager);
+                    if (instance != null) {
+                        this.value = instance;
+                    }
                 }
                 return instance;
             }
@@ -133,7 +136,7 @@ T get(Bean<T> bean, BeanManagerImpl manager, CreationalContext<?> ctx) {
                 return instance;
             }
             synchronized (this) {
-                if (value == null) {
+                if ((instance = value) == null) {
                     this.value = instance = super.get(bean, manager, ctx);
                 }
                 return instance;