svn commit: r1493784 - in /tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src: main/java/org/apache/openejb/concurrencyutilities/ee/task/CUTask.java test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java

[rm...@apache.org]

Author: rmannibucau
Date: Mon Jun 17 14:40:58 2013
New Revision: 1493784

URL: http://svn.apache.org/r1493784
Log:
TOMEE-979 propagating CDI scopes too - deactivating it since it seems opposed to CDI spec even if possible with jsr236

Modified:
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/task/CUTask.java
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java

Modified: tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/task/CUTask.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/task/CUTask.java?rev=1493784&r1=1493783&r2=1493784&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/task/CUTask.java (original)
+++ tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/task/CUTask.java Mon Jun 17 14:40:58 2013
@@ -78,8 +78,10 @@ public abstract class CUTask<T> extends 
         private final ThreadContext threadContext;
         private final ClassLoader loader;
 
+        /* propagation of CDI context seems wrong
         private final CdiAppContextsService contextService;
         private final CdiAppContextsService.State cdiState;
+        */
 
         private Context currentContext = null;
 
@@ -88,6 +90,7 @@ public abstract class CUTask<T> extends 
             this.threadContext = initialThreadContext;
             this.loader = initialLoader;
 
+            /* propagation of CDI context seems wrong
             final ContextsService genericContextsService = WebBeansContext.currentInstance().getContextsService();
             if (CdiAppContextsService.class.isInstance(genericContextsService)) {
                 contextService = CdiAppContextsService.class.cast(genericContextsService);
@@ -96,6 +99,7 @@ public abstract class CUTask<T> extends 
                 contextService = null;
                 cdiState = null;
             }
+            */
         }
 
         public void enter() {
@@ -115,9 +119,12 @@ public abstract class CUTask<T> extends 
             SECURITY_SERVICE.setState(securityServiceState);
 
             currentContext = new Context(threadState, oldCtx, oldCl);
+
+            /* propagation of CDI context seems wrong
             if (cdiState != null) {
                 contextService.restoreState(cdiState);
             }
+            */
         }
 
         public void exit() {
@@ -127,10 +134,12 @@ public abstract class CUTask<T> extends 
                 ThreadContext.exit(currentContext.threadContext);
             }
 
+            /* propagation of CDI context seems wrong
             if (currentContext.cdiState != null) {
                 contextService.restoreState(currentContext.cdiState);
                 contextService.removeThreadLocals();
             }
+            */
 
             Thread.currentThread().setContextClassLoader(currentContext.loader);
             currentContext = null;

Modified: tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java?rev=1493784&r1=1493783&r2=1493784&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java (original)
+++ tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java Mon Jun 17 14:40:58 2013
@@ -58,13 +58,13 @@ public class ManagedExecutorServiceTest 
     @Test
     public void checkEjbContext() throws Exception {
         assertTrue(facade.submit().get());
-        assertEquals(1, RequestBean.ID);
+        // assertEquals(1, RequestBean.ID); // CDI is opposed to it in the spirit
     }
 
     @Test
     public void checkCdiContext() throws Exception {
         assertTrue(cdiFacade.submit().get());
-        assertEquals(1, RequestBean.ID);
+        // assertEquals(1, RequestBean.ID); // CDI is opposed to it in the spirit
     }
 
     @Singleton