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/23 21:47:28 UTC
tomee git commit: trying to always activate session/request scopes
Repository: tomee
Updated Branches:
refs/heads/develop e7fd305a8 -> bcbbdd84a
trying to always activate session/request scopes
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/bcbbdd84
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/bcbbdd84
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/bcbbdd84
Branch: refs/heads/develop
Commit: bcbbdd84a38de8a9819f76bc2fb9f414aa40f0c2
Parents: e7fd305
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Dec 23 21:46:52 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Dec 23 21:46:52 2014 +0100
----------------------------------------------------------------------
.../org/apache/openejb/cdi/CdiAppContextsService.java | 12 +++++++++++-
tck/cdi-embedded/src/test/resources/failing.xml | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/bcbbdd84/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 c519838..178232c 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
@@ -460,7 +460,12 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
private RequestContext getRequestContext() {
- return requestContext.get();
+ RequestContext context = requestContext.get();
+ if (context == null) {
+ context = new RequestContext();
+ context.setActive(true);
+ }
+ return context;
}
private Context getSessionContext() {
@@ -468,6 +473,11 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
if (context == null || !context.isActive()) {
lazyStartSessionContext();
context = sessionContext.get();
+ if (context == null) {
+ context = new SessionContext();
+ context.setActive(true);
+ sessionContext.set(context);
+ }
}
return context;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bcbbdd84/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 d9a8ded..3380601 100644
--- a/tck/cdi-embedded/src/test/resources/failing.xml
+++ b/tck/cdi-embedded/src/test/resources/failing.xml
@@ -19,7 +19,7 @@
<test name="CDI TCK">
<!-- -Dopenejb.cdi.filter.classloader=false -Dorg.apache.openejb.assembler.classic.WebAppBuilder=org.apache.openejb.web.LightweightWebAppBuilder -Dopenejb.cdi.debug=true -Dopenejb.http.mock-request=true -->
<classes>
- <class name="org.jboss.cdi.tck.tests.interceptors.definition.broken.finalClassInterceptor.FinalMethodClassLevelInterceptorTest" />
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.specialization.SpecializationModularity02Test" />
</classes>
</test>
</suite>