Repository: tomee Updated Branches: refs/heads/master b8bb20e7d -> c693e0fbb
dont mess up cdi request scope for ejb request + ensure returned data is the fresh one when we need an update Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c693e0fb Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c693e0fb Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c693e0fb Branch: refs/heads/master Commit: c693e0fbb7611bf73c8160f2c71bc3c35501fb84 Parents: b8bb20e Author: Romain Manni-Bucau <[email protected]> Authored: Fri Mar 20 14:48:03 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Fri Mar 20 14:48:03 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/openejb/cdi/CdiAppContextsService.java | 1 + .../org/apache/openejb/cdi/RequestScopedThreadContextListener.java | 2 +- tck/cdi-embedded/src/test/resources/failing.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/c693e0fb/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 d319a95..d4a1d06 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 @@ -644,6 +644,7 @@ public class CdiAppContextsService extends AbstractContextsService implements Co ServletRequestContext context = requestContext.get(); if (context == null && create) { initRequestContext(null); + return requestContext.get(); } return context; } http://git-wip-us.apache.org/repos/asf/tomee/blob/c693e0fb/container/openejb-core/src/main/java/org/apache/openejb/cdi/RequestScopedThreadContextListener.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/RequestScopedThreadContextListener.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/RequestScopedThreadContextListener.java index 0b40c42..4e71875 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/RequestScopedThreadContextListener.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/RequestScopedThreadContextListener.java @@ -42,7 +42,7 @@ public class RequestScopedThreadContextListener implements ThreadContextListener final ContextsService contextsService = webBeansContext.getContextsService(); - final Context requestContext = contextsService.getCurrentContext(RequestScoped.class); + final Context requestContext = CdiAppContextsService.class.cast(contextsService).getRequestContext(false); if (requestContext == null) { contextsService.startContext(RequestScoped.class, CdiAppContextsService.EJB_REQUEST_EVENT); http://git-wip-us.apache.org/repos/asf/tomee/blob/c693e0fb/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 37bfa52..80a7e6f 100644 --- a/tck/cdi-embedded/src/test/resources/failing.xml +++ b/tck/cdi-embedded/src/test/resources/failing.xml @@ -31,7 +31,7 @@ -Dopenejb.embedded.try-jsp=true --> <classes> - <class name="org.jboss.cdi.tck.tests.context.conversation.InvalidatingSessionDestroysConversationTest" /> + <class name="org.jboss.cdi.tck.tests.context.request.ejb.EJBRequestContextTest" /> </classes> </test> </suite>
