You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2011/02/02 23:51:22 UTC
svn commit: r1066675 -
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
Author: struberg
Date: Wed Feb 2 22:51:22 2011
New Revision: 1066675
URL: http://svn.apache.org/viewvc?rev=1066675&view=rev
Log:
OWB-521 fix possible NPE
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java?rev=1066675&r1=1066674&r2=1066675&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java Wed Feb 2 22:51:22 2011
@@ -203,10 +203,13 @@ public class ProducerMethodBean<T> exten
ThreadLocal<Object> injectionTargetInstance = AbstractInjectable.instanceUnderInjection;
if(isInjectionToAnotherBean)
{
- if(oldDependents == null && injectionTargetInstance != null)
+ if(oldDependents == null)
{
- ((CreationalContextImpl)creationalContext).addDependent(injectionTargetInstance.get(),
- this , instance);
+ if (injectionTargetInstance != null && injectionTargetInstance.get() != null)
+ {
+ ((CreationalContextImpl)creationalContext).
+ addDependent(injectionTargetInstance.get(), this , instance);
+ }
}
else
{
@@ -226,8 +229,8 @@ public class ProducerMethodBean<T> exten
{
for(DependentCreationalContext<Object> dependent : dependents)
{
- ((CreationalContextImpl)creationalContext).addDependent(instance, dependent.getContextual(),
- dependent.getInstance());
+ ((CreationalContextImpl)creationalContext).
+ addDependent(instance, dependent.getContextual(), dependent.getInstance());
}
}
}
@@ -243,10 +246,13 @@ public class ProducerMethodBean<T> exten
{
if(isInjectionToAnotherBean)
{
- if(oldDependents == null && injectionTargetInstance != null)
+ if(oldDependents == null)
{
- ((CreationalContextImpl)creationalContext).addDependent(injectionTargetInstance.get(),
- this , instance);
+ if (injectionTargetInstance != null && injectionTargetInstance.get() != null)
+ {
+ ((CreationalContextImpl)creationalContext)
+ .addDependent(injectionTargetInstance.get(), this , instance);
+ }
}
else
{