svn commit: r1594148 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java

[jlmonteiro]

Author: jlmonteiro
Date: Tue May 13 07:13:14 2014
New Revision: 1594148

URL: http://svn.apache.org/r1594148
Log:
OPENEJB-2088 from Romain

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java?rev=1594148&r1=1594147&r2=1594148&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
 Tue May 13 07:13:14 2014
@@ -254,12 +254,14 @@ public class ThreadSingletonServiceImpl 
 
         final ContainerSystem containerSystem = 
SystemInstance.get().getComponent(ContainerSystem.class);
         for (final AppContext appContext : containerSystem.getAppContexts()) {
-            if (appContext.getClassLoader().equals(cl)) {
+            final ClassLoader appContextClassLoader = 
appContext.getClassLoader();
+            if (appContextClassLoader.equals(cl) || (cl != null && 
cl.equals(appContextClassLoader))) { // CxfContainerLoader is not symmetric
                 context = appContext.getWebBeansContext();
                 break;
             }
             for (final WebContext web : appContext.getWebContexts()) {
-                if (web.getClassLoader().equals(cl)) {
+                final ClassLoader webClassLoader = web.getClassLoader();
+                if (webClassLoader.equals(cl) || (cl != null && 
cl.equals(webClassLoader))) {
                     if (web.getWebbeansContext() != null) { // ear
                         context = web.getWebbeansContext();
                         break;