You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openwebbeans.apache.org by be...@apache.org on 2010/09/13 20:23:59 UTC

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

Author: bergmark
Date: Mon Sep 13 18:23:59 2010
New Revision: 996631

URL: http://svn.apache.org/viewvc?rev=996631&view=rev
Log:
[OWB-450] Prevent NPE in DependentScopedBeanInterceptorHandler when null creational context is used by EE components

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

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java?rev=996631&r1=996630&r2=996631&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java Mon Sep 13 18:23:59 2010
@@ -58,7 +58,7 @@ public class DependentScopedBeanIntercep
         {
             //If this creational context is owned by this DependentBean, add it
             CreationalContextImpl<?> ccImpl = (CreationalContextImpl<?>)creationalContext;
-            if(ccImpl.getBean().equals(bean))
+            if(ccImpl.getBean() != null && ccImpl.getBean().equals(bean))
             {
                 //Owner of the dependent is itself
                 ccImpl.addDependent(instance, bean, instance);