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 08:43:40 UTC
tomee git commit: @Timeout doesnt support conversations
Repository: tomee
Updated Branches:
refs/heads/develop 9c894b2af -> a13be7e0e
@Timeout doesnt support conversations
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a13be7e0
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a13be7e0
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a13be7e0
Branch: refs/heads/develop
Commit: a13be7e0ecd06a8d1fad52d946dbe8938d23fb17
Parents: 9c894b2
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Dec 29 08:43:11 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Dec 29 08:43:11 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/openejb/cdi/CdiAppContextsService.java | 9 +++++----
tck/cdi-embedded/src/test/resources/failing.xml | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/a13be7e0/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 45d350f..4e12a4e 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
@@ -509,13 +509,13 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
final HttpServletRequest req = HttpServletRequest.class.isInstance(request) ? HttpServletRequest.class.cast(request) : null;
ConversationContext context = ConversationContext.class.isInstance(request) ? ConversationContext.class.cast(request) : null;
- if (context == null) {
+ final ThreadContext tc = ThreadContext.getThreadContext();
+ if (context == null && (tc == null || tc.getCurrentOperation() != Operation.TIMEOUT)) {
final ConversationContext existingContext = conversationContext.get();
if (existingContext == null) {
context = new ConversationContext();
context.setActive(true);
- conversationContext.set(context);
final Object event;
if (req != null) {
event = req;
@@ -527,10 +527,11 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
} else {
context = existingContext;
}
- } else {
+ }
+ if (context != null) {
conversationContext.set(context);
+ context.setActive(true);
}
- context.setActive(true);
}
/**
http://git-wip-us.apache.org/repos/asf/tomee/blob/a13be7e0/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 aed8972..c509cd8 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.conversation.filter.ConversationFilterTest" />
+ <class name="org.jboss.cdi.tck.tests.context.conversation.inactive.InactiveConversationTest" />
</classes>
</test>
</suite>