Author: remy.maucherat(a)jboss.com Date: 2008-06-24 12:28:54 -0400 (Tue, 24 Jun 2008) New Revision: 685 Modified: trunk/java/org/apache/catalina/session/StandardSession.java Log: - Port patch: Fix NPE for compatibility. Modified: trunk/java/org/apache/catalina/session/StandardSession.java =================================================================== --- trunk/java/org/apache/catalina/session/StandardSession.java 2008-06-24 16:27:43 UTC (rev 684) +++ trunk/java/org/apache/catalina/session/StandardSession.java 2008-06-24 16:28:54 UTC (rev 685) @@ -1638,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);