You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/12/29 12:34:15 UTC

tomee git commit: propagating request scope to AsyncContext + few missing files

Repository: tomee
Updated Branches:
  refs/heads/develop 6597ead7a -> 2329bf8a4


propagating request scope to AsyncContext + few missing files


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2329bf8a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2329bf8a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2329bf8a

Branch: refs/heads/develop
Commit: 2329bf8a48771e25a33039db45a5c9c51cd3d036
Parents: 6597ead
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Dec 29 12:33:56 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Dec 29 12:33:56 2014 +0100

----------------------------------------------------------------------
 .../openejb/cdi/CdiAppContextsService.java      |  93 +++++++---
 .../jdbc/dbcp/DataSourceSerialization.java      |  40 ++++
 .../jdbc/DataSourceSerializationTest.java       |  53 ++++++
 .../openejb/server/httpd/HttpRequestImpl.java   |  12 +-
 .../server/httpd/OpenEJBAsyncContext.java       |   7 +-
 .../openejb/server/httpd/WebBeansFilter.java    | 184 +++++++++++++++++++
 tck/cdi-embedded/src/test/resources/failing.xml |   2 +-
 .../tomee/catalina/OpenEJBContextConfig.java    |  17 ++
 8 files changed, 375 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/2329bf8a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
index 4e12a4e..0935ce4 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
@@ -177,7 +177,10 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
 
         for (final Map.Entry<Conversation, ConversationContext> conversation : webBeansContext.getConversationManager().getAllConversationContexts().entrySet()) {
             conversation.getValue().destroy();
-            webBeansContext.getBeanManagerImpl().fireEvent(conversation.getKey().getId(), DestroyedLiteral.CONVERSATION);
+            final String id = conversation.getKey().getId();
+            if (id != null) {
+                webBeansContext.getBeanManagerImpl().fireEvent(id, DestroyedLiteral.CONVERSATION);
+            }
         }
         for (final SessionContext sc : sessionCtxManager.getContextById().values()) {
             final Object event = HttpSessionContextSessionAware.class.isInstance(sc) ? HttpSessionContextSessionAware.class.cast(sc).getSession() : sc;
@@ -256,7 +259,7 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
         } else if (scopeType.equals(ApplicationScoped.class)) {
             return getApplicationContext();
         } else if (supportsConversation() && scopeType.equals(ConversationScoped.class)) {
-            return getConversationContext(false);
+            return getConversationContext(true);
         } else if (scopeType.equals(Dependent.class)) {
             return dependentContext;
         } else if (scopeType.equals(Singleton.class)) {
@@ -333,6 +336,18 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
 
                 if (session != null) {
                     initSessionContext(session);
+
+                    final ServletRequestContext rc  = getRequestContext(false);
+                    if (rc != null && rc.getServletRequest() != null && conversationService != null) {
+                        final String cid = rc.getServletRequest().getParameter("cid");
+                        if (cid != null) {
+                            final ConversationManager conversationManager = webBeansContext.getConversationManager();
+                            final ConversationImpl c = conversationManager.getPropogatedConversation(cid, session.getId());
+                            if (c != null) {
+                                conversationContext.set(conversationManager.getConversationContext(c));
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -345,7 +360,8 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
             if (session != null) {
                 final String cid = rc.getServletRequest().getParameter("cid");
                 if (cid != null) {
-                    final ConversationImpl c = webBeansContext.getConversationManager().getPropogatedConversation(cid, session.getId());
+                    final ConversationManager conversationManager = webBeansContext.getConversationManager();
+                    final ConversationImpl c = conversationManager.getPropogatedConversation(cid, session.getId());
                     if (c != null && c.iUseIt() > 1) {
                         throw new BusyConversationException("busy conversation " + c.getId() + '(' + c.getSessionId() + ')');
                     }
@@ -358,15 +374,15 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
         // execute request tasks
         endRequest();
 
-        if (supportsConversation()) { // OWB-595
-            cleanupConversation();
-        }
-
         //Get context
         final RequestContext context = getRequestContext(false);
 
         //Destroy context
         if (context != null) {
+            if (supportsConversation()) { // OWB-595
+                cleanupConversation();
+            }
+
             final HttpServletRequest servletRequest = ServletRequestContext.class.cast(context).getServletRequest();
             if (servletRequest != null) {
                 webBeansContext.getBeanManagerImpl().fireEvent(servletRequest, DestroyedLiteral.REQUEST);
@@ -387,12 +403,7 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
     }
 
     private void cleanupConversation() {
-        if (conversationService == null) {
-            return;
-        }
-
-        final ConversationContext conversationContext = getConversationContext(false);
-        if (conversationContext == null) {
+        if (conversationService == null || getConversationContext(false) == null) {
             return;
         }
 
@@ -403,7 +414,8 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
         }
 
         if (conversation.isTransient()) {
-            webBeansContext.getContextsService().endContext(ConversationScoped.class, null);
+            endContext(ConversationScoped.class, null);
+            conversationManager.removeConversation(conversation); // in case end() was called
         } else {
             final ConversationImpl conversationImpl = (ConversationImpl) conversation;
             conversationImpl.updateTimeOut();
@@ -427,16 +439,21 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
         SessionContext currentSessionContext = sessionCtxManager.getSessionContextWithSessionId(sessionId);
 
         //No current context
+        boolean fire = false;
         if (currentSessionContext == null) {
             currentSessionContext = newSessionContext(session);
             sessionCtxManager.addNewSessionContext(sessionId, currentSessionContext);
-            webBeansContext.getBeanManagerImpl().fireEvent(session, InitializedLiteral.SESSION);
+            fire = true;
         }
         //Activate
         currentSessionContext.setActive(true);
 
         //Set thread local
         sessionContext.set(currentSessionContext);
+
+        if (fire) {
+            webBeansContext.getBeanManagerImpl().fireEvent(session, InitializedLiteral.SESSION);
+        }
     }
 
     private SessionContext newSessionContext(final HttpSession session) {
@@ -502,28 +519,27 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
      *
      * @param context context
      */
-    private void initConversationContext(final Object request) {
+    private ConversationContext initConversationContext(final Object request) {
         if (conversationService == null) {
-            return;
+            return null;
         }
 
         final HttpServletRequest req = HttpServletRequest.class.isInstance(request) ? HttpServletRequest.class.cast(request) : null;
         ConversationContext context = ConversationContext.class.isInstance(request) ? ConversationContext.class.cast(request) : null;
         final ThreadContext tc = ThreadContext.getThreadContext();
+        Object event = null;
         if (context == null && (tc == null || tc.getCurrentOperation() != Operation.TIMEOUT)) {
             final ConversationContext existingContext = conversationContext.get();
             if (existingContext == null) {
                 context = new ConversationContext();
                 context.setActive(true);
 
-                final Object event;
                 if (req != null) {
                     event = req;
                 } else {
                     final ServletRequestContext servletRequestContext = getRequestContext(true);
                     event = servletRequestContext != null && servletRequestContext.getServletRequest() != null ? servletRequestContext.getServletRequest() : context;
                 }
-                webBeansContext.getBeanManagerImpl().fireEvent(event, InitializedLiteral.CONVERSATION);
             } else {
                 context = existingContext;
             }
@@ -531,7 +547,11 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
         if (context != null) {
             conversationContext.set(context);
             context.setActive(true);
+            if (event != null) {
+                webBeansContext.getBeanManagerImpl().fireEvent(event, InitializedLiteral.CONVERSATION);
+            }
         }
+        return context;
     }
 
     /**
@@ -604,17 +624,40 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
      *
      * @return conversation context
      */
-    private ConversationContext getConversationContext(final boolean createIfMissing) {
+    private ConversationContext getConversationContext(final boolean createIfPropagated) {
         ConversationContext context = conversationContext.get();
-        final ThreadContext tc = ThreadContext.getThreadContext();
-        if (context == null && (createIfMissing && (tc == null || tc.getCurrentOperation() != Operation.TIMEOUT))) {
-            getRequestContext(true); // needs to exist for Conversation scope
-            initConversationContext(null);
-            return getConversationContext(false);
+        if (context == null && createIfPropagated && !isTimeout()) {
+            final ServletRequestContext rc  = getRequestContext(true); // needs to exist for Conversation scope
+            if (rc != null && rc.getServletRequest() != null) {
+                final HttpServletRequest servletRequest = rc.getServletRequest();
+                final HttpSession session = servletRequest.getSession(false);
+                if (session != null) {
+                    final String cid = rc.getServletRequest().getParameter("cid");
+                    if (cid != null) {
+                        final ConversationManager conversationManager = webBeansContext.getConversationManager();
+                        final ConversationImpl conversation = conversationManager.getPropogatedConversation(cid, session.getId());
+                        if (conversation != null) {
+                            final ConversationContext ctx = conversationManager.getConversationContext(conversation);
+                            if (ctx != null) {
+                                conversationContext.set(ctx);
+                                ctx.setActive(true);
+                                return ctx;
+                            }
+                        }
+                    }
+                    // else create a new one, we ensure we have a session before doing it cause in several cases - stateless - we don't want to create a new one if not
+                    return initConversationContext(servletRequest);
+                }
+            }
         }
         return context;
     }
 
+    private boolean isTimeout() {
+        final ThreadContext tc = ThreadContext.getThreadContext();
+        return tc != null && tc.getCurrentOperation() == Operation.TIMEOUT;
+    }
+
     private Context lazyStartSessionContext() {
 
         if (logger.isDebugEnabled()) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/2329bf8a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/DataSourceSerialization.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/DataSourceSerialization.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/DataSourceSerialization.java
new file mode 100644
index 0000000..1ed3595
--- /dev/null
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/DataSourceSerialization.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.resource.jdbc.dbcp;
+
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.spi.ContainerSystem;
+
+import javax.naming.NamingException;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+
+public class DataSourceSerialization implements Serializable {
+    private final String name;
+
+    public DataSourceSerialization(String name) {
+        this.name = name;
+    }
+
+    Object readResolve() throws ObjectStreamException {
+        try {
+            return SystemInstance.get().getComponent(ContainerSystem.class).getJNDIContext().lookup("openejb:Resource/" + name);
+        } catch (final NamingException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/2329bf8a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DataSourceSerializationTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DataSourceSerializationTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DataSourceSerializationTest.java
new file mode 100644
index 0000000..28baa8a
--- /dev/null
+++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DataSourceSerializationTest.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.resource.jdbc;
+
+import org.apache.commons.lang3.SerializationUtils;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.ContainerProperties;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.annotation.Resource;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.sql.DataSource;
+
+import java.io.Serializable;
+
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(ApplicationComposer.class)
+@ContainerProperties(@ContainerProperties.Property(name = "ds", value = "new://Resource?type=DataSource"))
+@Classes(cdi = true, innerClassesAsBean = true)
+public class DataSourceSerializationTest {
+    @Inject
+    private DataSource ds;
+
+    @Test
+    public void run() {
+        final DataSource d = SerializationUtils.deserialize(SerializationUtils.serialize(Serializable.class.cast(ds)));
+        assertNotNull(d);
+    }
+
+    public static class Producer {
+        @Resource(name = "ds")
+        @Produces
+        private DataSource produce;
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/2329bf8a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
----------------------------------------------------------------------
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
index bb5599c..aa9a566 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
@@ -37,6 +37,7 @@ import javax.servlet.ServletRequestEvent;
 import javax.servlet.ServletRequestListener;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpUpgradeHandler;
@@ -190,6 +191,8 @@ public class HttpRequestImpl implements HttpRequest {
     private String servletPath = null;
     private Collection<ServletRequestListener> listeners;
 
+    private volatile boolean asyncStarted;
+
     public HttpRequestImpl(URI socketURI) {
         this.socketURI = socketURI;
     }
@@ -1037,12 +1040,13 @@ public class HttpRequestImpl implements HttpRequest {
         return startAsync(this, HttpResponse.class.cast(getAttribute("openejb_response")));
     }
 
-    @Override
+    @Override // avoids the need of org.apache.openejb.server.httpd.WebBeansFilter in embedded mode
     public AsyncContext startAsync(final ServletRequest servletRequest, final ServletResponse servletResponse) {
         setAttribute("openejb_async", "true");
-        final OpenEJBAsyncContext asyncContext = new OpenEJBAsyncContext(this /* TODO */, servletResponse, contextPath);
+        final OpenEJBAsyncContext asyncContext = new OpenEJBAsyncContext(HttpServletRequest.class.cast(servletRequest) /* TODO */, servletResponse, contextPath);
         asyncContext.internalStartAsync();
-        return asyncContext;
+        asyncStarted = true;
+        return new WebBeansFilter.AsynContextWrapper(asyncContext);
     }
 
     public String getParameter(String name) {
@@ -1141,7 +1145,7 @@ public class HttpRequestImpl implements HttpRequest {
 
     @Override
     public boolean isAsyncStarted() {
-        return false;
+        return asyncStarted;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/tomee/blob/2329bf8a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBAsyncContext.java
----------------------------------------------------------------------
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBAsyncContext.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBAsyncContext.java
index f61c799..eb6d660 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBAsyncContext.java
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBAsyncContext.java
@@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.Socket;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -95,7 +96,7 @@ public class OpenEJBAsyncContext implements AsyncContext {
 
     private final List<AsyncListener> listeners = new ArrayList<>();
     private final ServletResponse response;
-    private final HttpRequestImpl request;
+    private final HttpServletRequest request;
     private final Socket socket;
     private final AsyncEvent event;
     private WebContext context = null;
@@ -104,7 +105,7 @@ public class OpenEJBAsyncContext implements AsyncContext {
     private long timeout = 30000;
     private long lastTouch = System.currentTimeMillis();
 
-    public OpenEJBAsyncContext(final HttpRequestImpl request, final ServletResponse response, final String contextPath) {
+    public OpenEJBAsyncContext(final HttpServletRequest request, final ServletResponse response, final String contextPath) {
         if (es == null) {
             synchronized (OpenEJBAsyncContext.class) { // we don't care since impl is not really thread safe, just here for testing
                 if (es == null) {
@@ -224,7 +225,7 @@ public class OpenEJBAsyncContext implements AsyncContext {
         final HttpListenerRegistry registry = SystemInstance.get().getComponent(HttpListenerRegistry.class);
         try {
             final String contextPath = this.context.getContextRoot().startsWith("/") ? this.context.getContextRoot() : ('/' + this.context.getContextRoot());
-            final HttpRequestImpl req = new HttpRequestImpl(request.getSocketURI()) {
+            final HttpRequestImpl req = new HttpRequestImpl(new URI(request.getRequestURI())) {
                 @Override
                 public String getContextPath() {
                     return contextPath;

http://git-wip-us.apache.org/repos/asf/tomee/blob/2329bf8a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/WebBeansFilter.java
----------------------------------------------------------------------
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/WebBeansFilter.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/WebBeansFilter.java
new file mode 100644
index 0000000..5040072
--- /dev/null
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/WebBeansFilter.java
@@ -0,0 +1,184 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.server.httpd;
+
+import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.spi.ContextsService;
+
+import javax.enterprise.context.RequestScoped;
+import javax.servlet.AsyncContext;
+import javax.servlet.AsyncListener;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletRequestEvent;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.io.IOException;
+
+public class WebBeansFilter implements Filter { // its pupose is to start/stop request scope in async tasks
+    @Override
+    public void init(final FilterConfig filterConfig) throws ServletException {
+        // no-op
+    }
+
+    @Override
+    public void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, final FilterChain filterChain) throws IOException, ServletException {
+        if (!HttpServletRequest.class.isInstance(servletRequest)) {
+            filterChain.doFilter(servletRequest, servletResponse);
+            return;
+        }
+        filterChain.doFilter(new CdiRequest(HttpServletRequest.class.cast(servletRequest)), servletResponse);
+    }
+
+    @Override
+    public void destroy() {
+        // no-op
+    }
+
+    public static class CdiRequest extends HttpServletRequestWrapper {
+        public CdiRequest(final HttpServletRequest cast) {
+            super(cast);
+        }
+
+        @Override
+        public AsyncContext startAsync() throws IllegalStateException {
+            return new AsynContextWrapper(super.startAsync());
+        }
+
+        @Override
+        public AsyncContext startAsync(final ServletRequest servletRequest, final ServletResponse servletResponse) throws IllegalStateException {
+            return new AsynContextWrapper(super.startAsync(servletRequest, servletResponse));
+        }
+    }
+
+    public static class AsynContextWrapper implements AsyncContext {
+        private final AsyncContext delegate;
+        private final ContextsService service;
+        private volatile ServletRequestEvent event;
+
+        public AsynContextWrapper(final AsyncContext asyncContext) {
+            this.delegate = asyncContext;
+            this.service = WebBeansContext.currentInstance().getService(ContextsService.class);
+            this.event = null;
+        }
+
+        private void startRequestScope() {
+            service.startContext(RequestScoped.class, getEvent());
+        }
+
+        private void stopRequestScope() {
+            service.endContext(RequestScoped.class, getEvent());
+        }
+
+        private ServletRequestEvent getEvent() {
+            if (event == null || event.getServletRequest() != getRequest()) {
+                synchronized (this) {
+                    if (event == null || event.getServletRequest() != getRequest()) {
+                        final ServletRequest request = delegate.getRequest();
+                        event = new ServletRequestEvent(request.getServletContext(), request);
+                    }
+                }
+            }
+            return event;
+        }
+
+        @Override
+        public ServletRequest getRequest() {
+            return delegate.getRequest();
+        }
+
+        @Override
+        public ServletResponse getResponse() {
+            return delegate.getResponse();
+        }
+
+        @Override
+        public boolean hasOriginalRequestAndResponse() {
+            return delegate.hasOriginalRequestAndResponse();
+        }
+
+        @Override
+        public void dispatch() {
+            delegate.dispatch();
+        }
+
+        @Override
+        public void dispatch(final String s) {
+            delegate.dispatch(s);
+        }
+
+        @Override
+        public void dispatch(final ServletContext servletContext, final String s) {
+            delegate.dispatch(servletContext, s);
+        }
+
+        @Override
+        public void complete() {
+            startRequestScope();
+            try {
+                delegate.complete();
+            } finally {
+                stopRequestScope();
+            }
+        }
+
+        @Override
+        public void start(final Runnable runnable) {
+            delegate.start(new Runnable() {
+                @Override
+                public void run() {
+                    startRequestScope();
+                    try {
+                        runnable.run();
+                    } finally {
+                        stopRequestScope();
+                    }
+                }
+            });
+        }
+
+        @Override
+        public void addListener(final AsyncListener asyncListener) {
+            delegate.addListener(asyncListener);
+        }
+
+        @Override
+        public void addListener(final AsyncListener asyncListener, final ServletRequest servletRequest, final ServletResponse servletResponse) {
+            delegate.addListener(asyncListener, servletRequest, servletResponse);
+        }
+
+        @Override
+        public <T extends AsyncListener> T createListener(final Class<T> aClass) throws ServletException {
+            return delegate.createListener(aClass);
+        }
+
+        @Override
+        public void setTimeout(final long l) {
+            delegate.setTimeout(l);
+        }
+
+        @Override
+        public long getTimeout() {
+            return delegate.getTimeout();
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/2329bf8a/tck/cdi-embedded/src/test/resources/failing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/resources/failing.xml b/tck/cdi-embedded/src/test/resources/failing.xml
index c7ce362..3176e43 100644
--- a/tck/cdi-embedded/src/test/resources/failing.xml
+++ b/tck/cdi-embedded/src/test/resources/failing.xml
@@ -26,7 +26,7 @@
     -Dopenejb.deploymentId.format={appId}/{ejbJarId}/{ejbName}
     -->
     <classes>
-      <class name="org.jboss.cdi.tck.tests.context.passivating.dependency.resource.persistence.DataSourcePassivationDependencyTest" />
+      <class name="org.jboss.cdi.tck.tests.context.conversation.determination.ConversationDeterminationTest" />
     </classes>
   </test>
 </suite>

http://git-wip-us.apache.org/repos/asf/tomee/blob/2329bf8a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
index d8d3832..6ba844b 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
@@ -40,6 +40,7 @@ import org.apache.openejb.config.NewLoaderLogic;
 import org.apache.openejb.config.ServiceUtils;
 import org.apache.openejb.loader.IO;
 import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.server.httpd.WebBeansFilter;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
 import org.apache.openejb.util.URLs;
@@ -48,6 +49,8 @@ import org.apache.tomcat.util.bcel.classfile.ClassFormatException;
 import org.apache.tomcat.util.bcel.classfile.ElementValuePair;
 import org.apache.tomcat.util.bcel.classfile.JavaClass;
 import org.apache.tomcat.util.descriptor.web.ContextResource;
+import org.apache.tomcat.util.descriptor.web.FilterDef;
+import org.apache.tomcat.util.descriptor.web.FilterMap;
 import org.apache.tomcat.util.descriptor.web.JspPropertyGroup;
 import org.apache.tomcat.util.descriptor.web.WebXml;
 import org.apache.tomcat.util.digester.Digester;
@@ -348,6 +351,20 @@ public class OpenEJBContextConfig extends ContextConfig {
             }
         }
 
+        {
+            final FilterDef filter = new FilterDef();
+            filter.setAsyncSupported("true");
+            filter.setDescription("OpenEJB CDI Filter - to propagate @RequestScoped in async tasks");
+            filter.setDisplayName("OpenEJB_CDI");
+            filter.setFilterClass(WebBeansFilter.class.getName());
+            webXml.addFilter(filter);
+
+            final FilterMap mapping = new FilterMap();
+            mapping.setFilterName(filter.getFilterName());
+            mapping.addURLPattern("/*");
+            webXml.addFilterMapping(mapping);
+        }
+
         return webXml;
     }