svn commit: r1440298 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/UpdatableSessionContextManager.java

[rmannibucau]

Author: rmannibucau
Date: Wed Jan 30 07:42:12 2013
New Revision: 1440298

URL: http://svn.apache.org/viewvc?rev=1440298&view=rev
Log:
avoiding NPE with UpdatableSessionContextManager

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/UpdatableSessionContextManager.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/UpdatableSessionContextManager.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/UpdatableSessionContextManager.java?rev=1440298&r1=1440297&r2=1440298&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/UpdatableSessionContextManager.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/UpdatableSessionContextManager.java
 Wed Jan 30 07:42:12 2013
@@ -46,7 +46,15 @@ public class UpdatableSessionContextMana
     }
 
     public void updateSessionIdMapping(final String oldId, final String newId) 
{
+        if (oldId == null) {
+            return;
+        }
+
         final SessionContext sc = getSessionContextWithSessionId(oldId);
+        if (sc == null) {
+            return;
+        }
+
         addNewSessionContext(newId, sc);
         contextById.remove(oldId);
     }