Repository: tomee Updated Branches: refs/heads/master 02c27f905 -> 79b4b4752
reversed test, fixing Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/79b4b475 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/79b4b475 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/79b4b475 Branch: refs/heads/master Commit: 79b4b47527f63237fc25333f3ea6e5c9503eb466 Parents: 02c27f9 Author: Romain Manni-Bucau <[email protected]> Authored: Sun Mar 22 21:52:38 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Sun Mar 22 21:52:38 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/openejb/cdi/CdiAppContextsService.java | 2 +- tck/cdi-embedded/src/test/resources/failing.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/79b4b475/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 6966549..0e690a5 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 @@ -381,7 +381,7 @@ public class CdiAppContextsService extends AbstractContextsService implements Co } } - if (cid == null && !isTimeout() && !autoConversationCheck) { + if (cid == null && !isTimeout() && autoConversationCheck) { // transient but active initConversationContext(request); } http://git-wip-us.apache.org/repos/asf/tomee/blob/79b4b475/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 47c689c..29ceb53 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.implementation.simple.resource.broken.type.ejb.ResourceDefinitionWithDifferentTypeTest" /> + <class name="org.jboss.cdi.tck.tests.context.conversation.event.LongRunningConversationLifecycleEventTest" /> </classes> </test> </suite>
