From fa484c86bfd20da4d924a4833d0e202acb1e27bd Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 16 Nov 2010 16:41:13 +0000
Subject: [PATCH] Avoid NPE when removing sessions

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1035685 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/session/ManagerBase.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/session/ManagerBase.java b/java/org/apache/catalina/session/ManagerBase.java
index 3c7b4fe63..4b2acd5f8 100644
--- 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());
+        }
     }
 
 
-- 
2.11.0