Author: struberg
Date: Wed Mar 9 18:44:04 2011
New Revision: 1079926
URL: http://svn.apache.org/viewvc?rev=1079926&view=rev
Log:
OWB-542 oops, something went wrong with the revert. all fixed now ;)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java?rev=1079926&r1=1079925&r2=1079926&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
Wed Mar 9 18:44:04 2011
@@ -37,6 +37,7 @@ import org.apache.webbeans.component.Inj
import org.apache.webbeans.component.InstanceBean;
import org.apache.webbeans.component.OwbBean;
import org.apache.webbeans.container.InjectionResolver;
+import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.context.creational.DependentCreationalContext;
import org.apache.webbeans.util.ClassUtil;
import org.apache.webbeans.util.WebBeansUtil;
@@ -138,6 +139,15 @@ public abstract class AbstractInjectable
}
}
+ // add this dependent into bean dependent list
+ if (!WebBeansUtil.isStaticInjection(injectionPoint) &&
WebBeansUtil.isDependent(injectedBean))
+ {
+ if(instanceUnderInjection.get() != null)
+ {
+
((CreationalContextImpl<?>)this.injectionOwnerCreationalContext).addDependent(instanceUnderInjection.get(),injectedBean,
injected);
+ }
+ }
+
return injected;
}