Do not throw attribute value.

Patch provided by Tomaz Cerar cerar at parsek.com

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

diff --git a/java/org/apache/catalina/session/LocalStrings.properties b/java/org/apache/catalina/session/LocalStrings.properties
index 98a344f..7d8f38f 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 {0} with value {1}
+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}

diff --git a/java/org/apache/catalina/session/LocalStrings_es.properties b/java/org/apache/catalina/session/LocalStrings_es.properties
index d886780..56135e9 100644 (file)
--- a/java/org/apache/catalina/session/LocalStrings_es.properties
+++ b/java/org/apache/catalina/session/LocalStrings_es.properties
@@ -63,7 +63,7 @@ standardSession.getValueNames.ise = getValueNames\: La Sesi\u00F3n ya ha sido in
 standardSession.notSerializable = No puedo serializar atributo de sesi\u00F3n {0} para sesi\u00F3n {1}
 standardSession.removeAttribute.ise = removeAttribute\: La Sesi\u00F3n ya ha sido invalidada
 standardSession.sessionEvent = El oyente de evento de Sesi\u00F3n lanz\u00F3 una execpci\u00F3n
-standardSession.setAttribute.iae = setAttribute\: Atributo no serializable
+standardSession.setAttribute.iae = setAttribute\: Atributo {0} no serializable
 standardSession.setAttribute.ise = setAttribute\: La Sesi\u00F3n ya ha sido invalidada
 standardSession.setAttribute.namenull = setAttribute\: el nuevo par\u00E1metro no puede ser nulo
 standardSession.sessionCreated = Creada Sesi\u00F3n id \= {0}

diff --git a/java/org/apache/catalina/session/LocalStrings_fr.properties b/java/org/apache/catalina/session/LocalStrings_fr.properties
index 58f2842..094dace 100644 (file)
--- a/java/org/apache/catalina/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/session/LocalStrings_fr.properties
@@ -62,7 +62,7 @@ standardSession.getValueNames.ise="getValueNames": Session d
 standardSession.notSerializable=Impossible de sérialiser l''attribut de session {0} pour la session {1}
 standardSession.removeAttribute.ise="removeAttribute": Session déjà invalidée
 standardSession.sessionEvent=L''écouteur d''évènement de session (session event listener) a généré une exception
-standardSession.setAttribute.iae="setAttribute": attribut non sérialisable
+standardSession.setAttribute.iae="setAttribute": Attribut {0} non sérialisable
 standardSession.setAttribute.ise="setAttribute": Session déjà invalidée
 standardSession.setAttribute.namenull="setAttribute": le nom de paramètre ne peut être nul
 standardSession.sessionCreated=Création de l''Id de Session = {0}

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