svn commit: r1594659 - in /tomee/tomee/trunk/arquillian: arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/ arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/

[rmannibucau]

Author: rmannibucau
Date: Wed May 14 18:14:05 2014
New Revision: 1594659

URL: http://svn.apache.org/r1594659
Log:
simplifying TomEEInjectionEnricher and avoiding NPE in OpenEJBEnricher

Modified:
    
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
    
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java

Modified: 
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java?rev=1594659&r1=1594658&r2=1594659&view=diff
==============================================================================
--- 
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
 (original)
+++ 
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
 Wed May 14 18:14:05 2014
@@ -54,9 +54,11 @@ public final class OpenEJBEnricher {
     public static void enrich(final Object testInstance, final AppContext ctx) 
{
         // don't rely on arquillian since this enrichment should absolutely be 
done before the following ones
         new MockitoEnricher().enrich(testInstance);
+        if (ctx == null) {
+            return;
+        }
 
-        final BeanContext context = 
SystemInstance.get().getComponent(ContainerSystem.class)
-                .getBeanContext(ctx.getId() + "_" + 
testInstance.getClass().getName());
+        final BeanContext context = 
SystemInstance.get().getComponent(ContainerSystem.class).getBeanContext(ctx.getId()
 + "_" + testInstance.getClass().getName());
 
         final BeanManagerImpl bm = findBeanManager(ctx);
         if (bm != null && bm.isInUse()) {

Modified: 
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java?rev=1594659&r1=1594658&r2=1594659&view=diff
==============================================================================
--- 
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
 (original)
+++ 
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
 Wed May 14 18:14:05 2014
@@ -42,7 +42,7 @@ public class TomEEInjectionEnricher impl
         for (final AppContext app : containerSystem.getAppContexts()) {
             final BeanContext context = 
containerSystem.getBeanContext(app.getId() + "_" + className);
             if (context != null) {
-                return context.getModuleContext().getAppContext();
+                return app;
             }
         }
         return null;