[jboss-svn-commits] JBoss Common SVN: r4504 - in arquillian/trunk/testenrichers: resource/src/main/java/org/jboss/arquillian/testenricher/resource and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: aslak
Date: 2010-06-11 12:37:26 -0400 (Fri, 11 Jun 2010)
New Revision: 4504

Modified:
   arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/EJBInjectionEnricher.java
   arquillian/trunk/testenrichers/resource/src/main/java/org/jboss/arquillian/testenricher/resource/ResourceInjectionEnricher.java
Log:
ARQ-175 Should not inject into a field that is already set. We assume a previous enricher has handled it. CDI alone support both @EJB and @Resource


Modified: arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/EJBInjectionEnricher.java
===================================================================
--- arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/EJBInjectionEnricher.java	2010-06-11 16:34:33 UTC (rev 4503)
+++ arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/EJBInjectionEnricher.java	2010-06-11 16:37:26 UTC (rev 4504)
@@ -97,8 +97,11 @@
          
          for(Field field : annotatedFields) 
          {
-            Object ejb = lookupEJB(context, field.getType());
-            field.set(testCase, ejb);
+            if(field.get(testCase) == null) // only try to lookup fields that are not already set
+            {
+               Object ejb = lookupEJB(context, field.getType());
+               field.set(testCase, ejb);
+            }
          }
          
          List<Method> methods = SecurityActions.getMethodsWithAnnotation(

Modified: arquillian/trunk/testenrichers/resource/src/main/java/org/jboss/arquillian/testenricher/resource/ResourceInjectionEnricher.java
===================================================================
--- arquillian/trunk/testenrichers/resource/src/main/java/org/jboss/arquillian/testenricher/resource/ResourceInjectionEnricher.java	2010-06-11 16:34:33 UTC (rev 4503)
+++ arquillian/trunk/testenrichers/resource/src/main/java/org/jboss/arquillian/testenricher/resource/ResourceInjectionEnricher.java	2010-06-11 16:37:26 UTC (rev 4504)
@@ -70,8 +70,11 @@
          
          for(Field field : annotatedFields) 
          {
-            Object ejb = lookup(getResourceName(field));
-            field.set(testCase, ejb);
+            if(field.get(testCase) == null) // only try to lookup fields that are not already set
+            {
+               Object ejb = lookup(getResourceName(field));
+               field.set(testCase, ejb);
+            }
          }
          
          List<Method> methods = SecurityActions.getMethodsWithAnnotation(