[jbossweb-commits] JBossWeb SVN: r1529 - branches/JBOSSWEB_2_0_0_GA_CP11_JBPAPP-4889/src/share/classes/org/apache/catalina/session.

Author: mmillson Date: 2010-08-16 21:53:25 -0400 (Mon, 16 Aug 2010) New Revision: 1529 Modified: branches/JBOSSWEB_2_0_0_GA_CP11_JBPAPP-4889/src/share/classes/org/apache/catalina/session/StandardSession.java Log: Fix session attribute NullPointerException for [JBPAPP-4889]. Modified: branches/JBOSSWEB_2_0_0_GA_CP11_JBPAPP-4889/src/share/classes/org/apache/catalina/session/StandardSession.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP11_JBPAPP-4889/src/share/classes/org/apache/catalina/session/StandardSession.java 2010-08-17 01:03:01 UTC (rev 1528) +++ branches/JBOSSWEB_2_0_0_GA_CP11_JBPAPP-4889/src/share/classes/org/apache/catalina/session/StandardSession.java 2010-08-17 01:53:25 UTC (rev 1529) @@ -1032,6 +1032,10 @@ throw new IllegalStateException (sm.getString("standardSession.getAttribute.ise")); + if (name == null) { + return null; + } + return (attributes.get(name)); } @@ -1634,6 +1638,9 @@ */ protected void removeAttributeInternal(String name, boolean notify) { + // Avoid NPE + if (name == null) return; + // Remove this attribute from our collection Object value = attributes.remove(name);