Author: rmannibucau Date: Wed Jun 4 17:13:28 2014 New Revision: 1600357 URL: http://svn.apache.org/r1600357 Log: same fix as for tomee embedded for openejb embedded to avoid enriching without having a container
Modified: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java Modified: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java?rev=1600357&r1=1600356&r2=1600357&view=diff ============================================================================== --- tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java (original) +++ tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java Wed Jun 4 17:13:28 2014 @@ -42,6 +42,10 @@ public class OpenEJBInjectionEnricher im @Override public void enrich(final Object testInstance) { + if (!SystemInstance.isInitialized()) { + return; + } + new MockitoEnricher().enrich(testInstance); final AppContext context = appContext.get();