From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 13 Jun 2008 17:43:51 +0000 (+0000)
Subject: Fix bug 45195. NPE when calling getAttribute(null).
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f7f8193c754011ee694da9a71170c04acbeff0ae;p=tomcat7.0

Fix bug 45195. NPE when calling getAttribute(null).
The spec is unclear but this is a regression from 5.0.x

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

diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index 42113dc05..3f9e4610f 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -1032,6 +1032,8 @@ public class StandardSession
             throw new IllegalStateException
                 (sm.getString("standardSession.getAttribute.ise"));
 
+        if (name == null) return null;
+
         return (attributes.get(name));
 
     }