From d372e0dec14f56bc1b30d25dd140a44b57de727a Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 17 Jun 2008 22:13:00 +0000
Subject: [PATCH] Additional check related to bug 45195.

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

diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index 3f9e4610f..37f22af04 100644
--- 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);
 
-- 
2.11.0