You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ga...@apache.org on 2010/09/02 21:33:07 UTC
svn commit: r992069 -
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java
Author: gawor
Date: Thu Sep 2 19:33:07 2010
New Revision: 992069
URL: http://svn.apache.org/viewvc?rev=992069&view=rev
Log:
A NPE fix for SimpleCdiTest
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java?rev=992069&r1=992068&r2=992069&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java Thu Sep 2 19:33:07 2010
@@ -73,14 +73,16 @@ public class CdiResourceInjectionService
deployer.deploy(cdiInfo);
JndiEncInfoBuilder infoBuilder = new JndiEncInfoBuilder(appModule);
- JndiEncInfo encInfo = new JndiEncInfo();
- infoBuilder.build(cdiInfo, cdiInfo.getBeanName(), appModule.path, null, encInfo);
+ JndiEncInfo moduleJndiEnc = new JndiEncInfo();
+ JndiEncInfo jndiEnc = new JndiEncInfo();
+ infoBuilder.build(cdiInfo, cdiInfo.getBeanName(), appModule.path, moduleJndiEnc, jndiEnc);
InjectionBuilder builder = new InjectionBuilder(classLoader);
- List<Injection> injections = builder.buildInjections(encInfo);
+ List<Injection> injections = builder.buildInjections(jndiEnc);
cdiInfo.setInjections(injections);
- JndiEncBuilder encBuilder = new JndiEncBuilder(encInfo, injections, appModule.path, classLoader);
+ // TODO: handle app/global/module namespaces?
+ JndiEncBuilder encBuilder = new JndiEncBuilder(jndiEnc, injections, appModule.path, classLoader);
this.contexts.put(cdiInfo, encBuilder.build(JndiEncBuilder.JndiScope.comp));
}
}