Author: remy.maucherat(a)jboss.com Date: 2008-11-17 07:45:06 -0500 (Mon, 17 Nov 2008) New Revision: 857 Modified: trunk/java/org/apache/catalina/session/LocalStrings.properties trunk/java/org/apache/catalina/session/StandardSession.java trunk/webapps/docs/changelog.xml Log: - Add attribute name to the ISE. Modified: trunk/java/org/apache/catalina/session/LocalStrings.properties =================================================================== --- trunk/java/org/apache/catalina/session/LocalStrings.properties 2008-11-14 12:47:16 UTC (rev 856) +++ trunk/java/org/apache/catalina/session/LocalStrings.properties 2008-11-17 12:45:06 UTC (rev 857) @@ -48,7 +48,7 @@ standardSession.notSerializable=Cannot serialize session attribute {0} for session {1} standardSession.removeAttribute.ise=removeAttribute: Session already invalidated standardSession.sessionEvent=Session event listener threw exception -standardSession.setAttribute.iae=setAttribute: Non-serializable attribute +standardSession.setAttribute.iae=setAttribute: Non-serializable attribute {0} standardSession.setAttribute.ise=setAttribute: Session already invalidated standardSession.setAttribute.namenull=setAttribute: name parameter cannot be null standardSession.sessionCreated=Created Session id = {0} Modified: trunk/java/org/apache/catalina/session/StandardSession.java =================================================================== --- trunk/java/org/apache/catalina/session/StandardSession.java 2008-11-14 12:47:16 UTC (rev 856) +++ trunk/java/org/apache/catalina/session/StandardSession.java 2008-11-17 12:45:06 UTC (rev 857) @@ -1295,7 +1295,7 @@ if ((manager != null) && manager.getDistributable() && !(value instanceof Serializable)) throw new IllegalArgumentException - (sm.getString("standardSession.setAttribute.iae")); + (sm.getString("standardSession.setAttribute.iae", name)); // Construct an event with the new value HttpSessionBindingEvent event = null; Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-11-14 12:47:16 UTC (rev 856) +++ trunk/webapps/docs/changelog.xml 2008-11-17 12:45:06 UTC (rev 857) @@ -36,6 +36,9 @@ <bug>42673</bug>: In SSI, correctly handle includes with multi-level contexts. Patch provided by Peter Jodeleit. (markt) </fix> + <fix> + If throwing an exception for a non serializable attribute, mention the attribute name in the exception. (mturk) + </fix> </changelog> </subsection> </section>