remm 01/07/10 15:08:30
Modified: catalina/src/share/org/apache/catalina/session
LocalStrings.properties StandardSession.java
Log:
- Specifying a null name will result in a illegal arg exception being thrown.
Bug reported by Kumar Mettu <mettu.kumar at redspark.com>
Revision Changes Path
1.8 +1 -0
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/LocalStrings.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LocalStrings.properties 2001/04/26 01:40:55 1.7
+++ LocalStrings.properties 2001/07/10 22:08:25 1.8
@@ -42,6 +42,7 @@
standardSession.sessionEvent=Session event listener threw exception
standardSession.setAttribute.ise=setAttribute: Non-serializable attribute
standardSession.setAttribute.ise=setAttribute: Session already invalidated
+standardSession.setAttribute.namenull=setAttribute: name parameter cannot be null
standardSession.sessionCreated=Created Session id = {0}
persistentManager.loading=Loading {0} persisted sessions
persistentManager.unloading=Saving {0} persisted sessions
1.22 +9 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java
Index: StandardSession.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- StandardSession.java 2001/07/10 03:18:57 1.21
+++ StandardSession.java 2001/07/10 22:08:27 1.22
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
1.21 2001/07/10 03:18:57 jon Exp $
- * $Revision: 1.21 $
- * $Date: 2001/07/10 03:18:57 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
1.22 2001/07/10 22:08:27 remm Exp $
+ * $Revision: 1.22 $
+ * $Date: 2001/07/10 22:08:27 $
*
* ====================================================================
*
@@ -111,7 +111,7 @@
* @author Craig R. McClanahan
* @author Sean Legassick
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @version $Revision: 1.21 $ $Date: 2001/07/10 03:18:57 $
+ * @version $Revision: 1.22 $ $Date: 2001/07/10 22:08:27 $
*/
class StandardSession
@@ -1021,6 +1021,11 @@
* invalidated session
*/
public void setAttribute(String name, Object value) {
+
+ // Name cannot be null
+ if (name == null)
+ throw new IllegalArgumentException
+ (sm.getString("standardSession.setAttribute.namenull"));
// Null value is the same as removeAttribute()
if (value == null) {
