tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject tomee git commit: avoid NPE
Date Mon, 29 Dec 2014 17:56:57 GMT
Repository: tomee
Updated Branches:
  refs/heads/develop f112bdd7b -> 8ea00ebd4


avoid NPE


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8ea00ebd
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8ea00ebd
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8ea00ebd

Branch: refs/heads/develop
Commit: 8ea00ebd46f30209bb3195aa85ae3aacf5a60074
Parents: f112bdd
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Mon Dec 29 18:56:44 2014 +0100
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Mon Dec 29 18:56:44 2014 +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/8ea00ebd/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 7b91dbe..5e48183 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
@@ -446,7 +446,7 @@ public class CdiAppContextsService extends AbstractContextsService implements
Co
 
         final String sessionId = session.getId();
         //Current context
-        SessionContext currentSessionContext = sessionCtxManager.getSessionContextWithSessionId(sessionId);
+        SessionContext currentSessionContext = sessionId == null ? null : sessionCtxManager.getSessionContextWithSessionId(sessionId);
 
         //No current context
         boolean fire = false;

http://git-wip-us.apache.org/repos/asf/tomee/blob/8ea00ebd/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..bad9ab4 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.LongRunningConversationPropagatedByFacesContextTest"
/>
     </classes>
   </test>
 </suite>


Mime
View raw message