Avoid NPE when removing sessions

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1035685 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/session/ManagerBase.java b/java/org/apache/catalina/session/ManagerBase.java
index 3c7b4fe..4b2acd5 100644 (file)
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -905,9 +905,9 @@ public abstract class ManagerBase extends LifecycleMBeanBase
      */
     @Override
     public void remove(Session session) {
-
-        sessions.remove(session.getIdInternal());
-
+        if (session.getIdInternal() != null) {
+            sessions.remove(session.getIdInternal());
+        }
     }