Additional check related to bug 45195.

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

diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index 3f9e461..37f22af 100644 (file)
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -1636,6 +1636,9 @@ public class StandardSession
      */
     protected void removeAttributeInternal(String name, boolean notify) {
 
+        // Avoid NPE
+        if (name == null) return;
+
         // Remove this attribute from our collection
         Object value = attributes.remove(name);