svn commit: r1401680 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java

[rmannibucau]

Author: rmannibucau
Date: Wed Oct 24 13:47:29 2012
New Revision: 1401680

URL: http://svn.apache.org/viewvc?rev=1401680&view=rev
Log:
OPENEJB-1924 release of test class creational context for application composer

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java?rev=1401680&r1=1401679&r2=1401680&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java
 Wed Oct 24 13:47:29 2012
@@ -50,6 +50,7 @@ import org.apache.openejb.loader.SystemI
 import org.apache.openejb.spi.ContainerSystem;
 import org.apache.openejb.util.Join;
 import org.apache.openejb.util.ServiceManagerProxy;
+import org.apache.webbeans.inject.AbstractInjectable;
 import org.apache.webbeans.inject.OWBInjector;
 import org.apache.xbean.finder.AnnotationFinder;
 import org.apache.xbean.finder.IAnnotationFinder;
@@ -396,12 +397,15 @@ public class ApplicationComposer extends
                         final InjectionProcessor processor = new 
InjectionProcessor(testInstance, context.getInjections(), 
context.getJndiContext());
 
                         processor.createInstance();
+                        
AbstractInjectable.instanceUnderInjection.set(testInstance);
                         try {
                             OWBInjector.inject(appContext.getBeanManager(), 
testInstance, null);
                         } catch (Throwable t) {
                             // TODO handle this differently
                             // this is temporary till the injector can be 
rewritten
                             t.printStackTrace();
+                        } finally {
+                            AbstractInjectable.instanceUnderInjection.remove();
                         }
                     } finally {
                         ThreadContext.exit(oldContext);