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 2015/04/01 19:28:39 UTC
tomee git commit: ensuring to not eagerly trigger ghttp.getParameter
if conversation context is deactivated
Repository: tomee
Updated Branches:
refs/heads/master 1c83b2be3 -> 065171fcb
ensuring to not eagerly trigger ghttp.getParameter if conversation context is deactivated
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/065171fc
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/065171fc
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/065171fc
Branch: refs/heads/master
Commit: 065171fcb98f2f96250c6087c73252936044aa6b
Parents: 1c83b2b
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Apr 1 19:28:29 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Apr 1 19:28:29 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/openejb/cdi/CdiAppContextsService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/065171fc/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 0e690a5..7008ec2 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
@@ -364,7 +364,7 @@ public class CdiAppContextsService extends AbstractContextsService implements Co
//Re-initialize thread local for session
final HttpSession session = request.getSession(false);
- final String cid = request.getParameter("cid");
+ final String cid = conversationService != null ? request.getParameter("cid") : null;
if (session != null) {
initSessionContext(session);
if (autoConversationCheck && conversationService != null && !isConversationSkipped(request)) {