Author: rmannibucau
Date: Wed Oct 24 13:48:26 2012
New Revision: 1401684
URL: http://svn.apache.org/viewvc?rev=1401684&view=rev
Log:
OPENEJB-1924 release of test class creational context for EJBContainer
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java?rev=1401684&r1=1401683&r2=1401684&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
Wed Oct 24 13:48:26 2012
@@ -50,6 +50,7 @@ import org.apache.openejb.util.Logger;
import org.apache.openejb.util.OptionsLog;
import org.apache.openejb.util.ServiceManagerProxy;
import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.inject.AbstractInjectable;
import org.apache.webbeans.inject.OWBInjector;
import org.apache.webbeans.web.lifecycle.test.MockHttpSession;
import org.apache.webbeans.web.lifecycle.test.MockServletContext;
@@ -203,7 +204,12 @@ public class OpenEjbContainer extends EJ
oldContext = ThreadContext.enter(callContext);
}
try {
- OWBInjector.inject(webBeanContext.getBeanManagerImpl(), object,
null);
+ AbstractInjectable.instanceUnderInjection.set(object);
+ try {
+ OWBInjector.inject(webBeanContext.getBeanManagerImpl(),
object, null);
+ } finally {
+ AbstractInjectable.instanceUnderInjection.remove();
+ }
} catch (Throwable t) {
logger.warning("an error occured while injecting the class '" +
object.getClass().getName() + "': " + t.getMessage());
} finally {
