When throwing Non-serializable exception, mark which argument was non-serializable...

Needs localization to other local properties files.

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

diff --git a/java/org/apache/catalina/session/LocalStrings.properties b/java/org/apache/catalina/session/LocalStrings.properties
index 207fb9f..98a344f 100644 (file)
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -64,7 +64,7 @@ standardSession.getValueNames.ise=getValueNames: Session already invalidated
 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} with value {1}
 standardSession.setAttribute.ise=setAttribute: Session already invalidated
 standardSession.setAttribute.namenull=setAttribute: name parameter cannot be null
 standardSession.sessionCreated=Created Session id = {0}

diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index f5970c9..5a640f3 100644 (file)
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -1320,8 +1320,8 @@ public class StandardSession
         if ((manager != null) && manager.getDistributable() &&
           !(value instanceof Serializable))
             throw new IllegalArgumentException
-                (sm.getString("standardSession.setAttribute.iae"));
-
+                (sm.getString("standardSession.setAttribute.iae",
+                              name, value));
         // Construct an event with the new value
         HttpSessionBindingEvent event = null;