Author: rmannibucau
Date: Fri May 11 10:16:03 2012
New Revision: 1337100
URL: http://svn.apache.org/viewvc?rev=1337100&view=rev
Log:
TOMEE-189 if bean ref is null trying child
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java?rev=1337100&r1=1337099&r2=1337100&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
Fri May 11 10:16:03 2012
@@ -38,11 +38,16 @@ public class WebappBeanManager extends B
@Override
public Object getReference(Bean<?> bean, Type beanType,
CreationalContext<?> ctx) {
+ Object ref;
try {
- return getParentBm().getReference(bean, beanType, ctx);
+ ref = getParentBm().getReference(bean, beanType, ctx);
+ if (ref == null) {
+ ref = super.getReference(bean, beanType, ctx);
+ }
} catch (RuntimeException e) {
- return super.getReference(bean, beanType, ctx);
+ ref = super.getReference(bean, beanType, ctx);
}
+ return ref;
}
@Override
