Author: kkolinko
Date: Tue Nov 3 09:47:38 2009
New Revision: 832365
URL: http://svn.apache.org/viewvc?rev=832365&view=rev
Log:
Apply Mladen's patch
When throwing Non-serializable exception, mark which argument was
non-serializable to help tracing the cause when developing.
Note, that "setAttribute1.iae.patch" file is not available, so the change is
based on the trunk rev.713953,714002 + current LocalStrings_fr.properties of
trunk.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 3 09:47:38 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,772872,776921,776924,77
6935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,815972,817442,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831774,831850,831860
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,772872,77
6921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,815972,817442,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831774,831850,831860
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=832365&r1=832364&r2=832365&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov 3 09:47:38 2009
@@ -67,15 +67,6 @@
-1: remm: no for TC 6.0
-1: funkman : api change in Session.java for .x.x release
-* When throwing Non-serializable exception, mark which argument was
- non-serializable to help tracing the cause when developing.
- http://svn.apache.org/viewvc?rev=713953&view=rev
- http://svn.apache.org/viewvc?rev=714002&view=rev
- 6.0.x version of the patch:
- http://people.apache.org/~mturk/tomcat/setAttribute1.iae.patch
- +1: mturk, kkolinko, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39231
JAAS LoginContext expects a call to logout()
It is updated version of Mark's (since withdrawn) patch,
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=832365&r1=832364&r2=832365&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
Tue Nov 3 09:47:38 2009
@@ -63,7 +63,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:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties?rev=832365&r1=832364&r2=832365&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
Tue Nov 3 09:47:38 2009
@@ -62,7 +62,7 @@
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}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties?rev=832365&r1=832364&r2=832365&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
Tue Nov 3 09:47:38 2009
@@ -61,6 +61,9 @@
standardSession.notSerializable=Impossible de s\u00e9rialiser l''attribut de
session {0} pour la session {1}
standardSession.removeAttribute.ise="removeAttribute": Session d\u00e9j\u00e0
invalid\u00e9e
standardSession.sessionEvent=L''\u00e9couteur d''\u00e9v\u00e8nement de
session (session event listener) a
g\u00e9n\u00e9r\u0persistentManager.loading=Chargement de {0} sessions
persistantes
+standardSession.setAttribute.iae="setAttribute": Attribut {0} non
s\u00e9rialisable
+standardSession.setAttribute.ise="setAttribute": Session d\u00e9j\u00e0
invalid\u00e9e
+standardSession.setAttribute.namenull="setAttribute": le nom de param\u00e8tre
ne peut \u00eatre nul
persistentManager.unloading=Sauvegarde de {0} sessions persistantes
persistentManager.expiring=Expiration de {0} sessions avant leur sauvegarde
persistentManager.deserializeError=Erreur lors de la désérialisation de la
session {0}: {1}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java?rev=832365&r1=832364&r2=832365&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
Tue Nov 3 09:47:38 2009
@@ -1280,8 +1280,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: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=832365&r1=832364&r2=832365&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Nov 3 09:47:38 2009
@@ -239,6 +239,11 @@
<fix>
Close resource stream in WebappClassLoader after read error. (pero)
</fix>
+ <update>
+ Include attribute name into the text of Non-serializable exception
+ that might be thrown by Session.setAttribute() in distributable
+ applications. (mturk)
+ </update>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
