luehe 2005/03/23 14:44:14
Modified: catalina/src/share/org/apache/catalina/session
LocalStrings.properties LocalStrings_es.properties
LocalStrings_fr.properties
LocalStrings_ja.properties StandardSession.java
Log:
Fixed getId() so that it throws IllegalStateException when called on an
invalidated session, in order to be compliant with item 2
("Fix typos in HttpSession.java") of the Servlet 2.4 Errata at
http://jcp.org/aboutJava/communityprocess/maintenance/jsr154/errata204.txt
All Servlet TCKs still passing.
Revision Changes Path
1.7 +1 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/LocalStrings.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LocalStrings.properties 23 Mar 2005 22:21:18 -0000 1.6
+++ LocalStrings.properties 23 Mar 2005 22:44:14 -0000 1.7
@@ -42,6 +42,7 @@
standardSession.getAttributeNames.ise=getAttributeNames: Session already
invalidated
standardSession.getCreationTime.ise=getCreationTime: Session already
invalidated
standardSession.getLastAccessedTime.ise=getLastAccessedTime: Session already
invalidated
+standardSession.getId.ise=getId: Session already invalidated
standardSession.getMaxInactiveInterval.ise=getMaxInactiveInterval: Session
already invalidated
standardSession.getValueNames.ise=getValueNames: Session already invalidated
standardSession.notSerializable=Cannot serialize session attribute {0} for
session {1}
1.3 +1 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/LocalStrings_es.properties
Index: LocalStrings_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/LocalStrings_es.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalStrings_es.properties 23 Mar 2005 22:21:18 -0000 1.2
+++ LocalStrings_es.properties 23 Mar 2005 22:44:14 -0000 1.3
@@ -41,6 +41,7 @@
standardSession.getAttributeNames.ise=getAttributeNames: La Sesión ya ha
sido invalidada
standardSession.getCreationTime.ise=getCreationTime: La Sesión ya ha sido
invalidada
standardSession.getLastAccessedTime.ise=getLastAccessedTime: La Sesión ya ha
sido invalidada
+standardSession.getId.ise=getId: La Sesión ya ha sido invalidada
standardSession.getMaxInactiveInterval.ise=getMaxInactiveInterval: La Sesión
ya ha sido invalidada
standardSession.getValueNames.ise=getValueNames: La Sesión ya ha sido
invalidada
standardSession.notSerializable=No puedo serializar atributo de sesión {0}
para sesión {1}
1.6 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/LocalStrings_fr.properties
Index: LocalStrings_fr.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/LocalStrings_fr.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LocalStrings_fr.properties 23 Mar 2005 22:21:18 -0000 1.5
+++ LocalStrings_fr.properties 23 Mar 2005 22:44:14 -0000 1.6
@@ -39,6 +39,8 @@
standardSession.getAttribute.ise="getAttribute": Session déjà invalidée
standardSession.getAttributeNames.ise="getAttributeNames": Session déjà
invalidée
standardSession.getCreationTime.ise="getCreationTime": Session déjà invalidée
+standardSession.getLastAccessedTime.ise="getLastAccessedTime": Session
d\u00E9j\u00E0 invalid\u00E9e
+standardSession.getId.ise=getId: Session déjà invalidée
standardSession.getMaxInactiveInterval.ise="getMaxInactiveInterval": Session
déjà invalidée
standardSession.getValueNames.ise="getValueNames": Session déjà invalidée
standardSession.notSerializable=Impossible de sérialiser l''attribut de
session {0} pour la session {1}
@@ -61,5 +63,3 @@
persistentManager.processSwaps=Recherche de sessions à basculer vers
stockage (swap out), {0} sessions actives en mémoire
persistentManager.activeSession=La session {0} a été en attente durant {1}
secondes
persistentManager.swapIn=Basculement depuis le stockage (swap in) de la
session {0}
-
-standardSession.getLastAccessedTime.ise="getLastAccessedTime": Session
d\u00E9j\u00E0 invalid\u00E9e
1.8 +1 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/LocalStrings_ja.properties
Index: LocalStrings_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/LocalStrings_ja.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LocalStrings_ja.properties 23 Mar 2005 22:21:18 -0000 1.7
+++ LocalStrings_ja.properties 23 Mar 2005 22:44:14 -0000 1.8
@@ -42,6 +42,7 @@
standardSession.getAttributeNames.ise=getAttributeNames:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
standardSession.getCreationTime.ise=getCreationTime:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
standardSession.getLastAccessedTime.ise=getLastAccessedTime:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
+standardSession.getId.ise=getId:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
standardSession.getMaxInactiveInterval.ise=getMaxInactiveInterval:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
standardSession.getValueNames.ise=getValueNames:
\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
standardSession.notSerializable=\u30bb\u30c3\u30b7\u30e7\u30f3 {1}
\u306e\u305f\u3081\u306b\u30bb\u30c3\u30b7\u30e7\u30f3\u5c5e\u6027 {0}
\u3092\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u3067\u304d\u307e\u305b\u3093
1.54 +6 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java
Index: StandardSession.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- StandardSession.java 22 Mar 2005 15:26:44 -0000 1.53
+++ StandardSession.java 23 Mar 2005 22:44:14 -0000 1.54
@@ -321,6 +321,11 @@
*/
public String getId() {
+ if ( !isValid() ) {
+ throw new IllegalStateException
+ (sm.getString("standardSession.getId.ise"));
+ }
+
return (this.id);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
