svn commit: r936161 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java

[gerdogdu]

Author: gerdogdu
Date: Wed Apr 21 05:44:54 2010
New Revision: 936161

URL: http://svn.apache.org/viewvc?rev=936161&view=rev
Log:
Adding more check for CC control

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java?rev=936161&r1=936160&r2=936161&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
 Wed Apr 21 05:44:54 2010
@@ -112,7 +112,7 @@ public class NormalScopedBeanInterceptor
                 creationalContext = new 
WeakReference<CreationalContext<?>>(cc);
             }
         }
-        if (creationalContext == null)
+        if ((creationalContext == null) || creationalContext.get() == null)
         {
             // if there was no CreationalContext set from external, we create 
a new one
             creationalContext = new 
WeakReference<CreationalContext<?>>(CreationalContextFactory.getInstance().getCreationalContext(bean));