Author: markt
Date: Tue Nov 16 16:41:13 2010
New Revision: 1035685
URL: http://svn.apache.org/viewvc?rev=1035685&view=rev
Log:
Avoid NPE when removing sessions
Modified:
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1035685&r1=1035684&r2=1035685&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Tue Nov 16
16:41:13 2010
@@ -905,9 +905,9 @@ public abstract class ManagerBase extend
*/
@Override
public void remove(Session session) {
-
- sessions.remove(session.getIdInternal());
-
+ if (session.getIdInternal() != null) {
+ sessions.remove(session.getIdInternal());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
