craigmcc 01/04/26 10:23:38
Modified: catalina/src/share/org/apache/catalina/connector
RequestBase.java
catalina/src/share/org/apache/catalina/core
ApplicationContext.java
catalina/src/share/org/apache/catalina/session
StandardSession.java
Log:
[PFD2-Javadocs]
In the methods:
ServletRequest.setAttribute(String name, Object value)
ServletContext.setAttribute(String name, Object value)
HttpSession.setAttribute(String name, Object value)
passing a null value now has the same effect as calling the corresponding
removeValue(name) method.
Revision Changes Path
1.11 +10 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java
Index: RequestBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RequestBase.java 2001/04/25 21:39:16 1.10
+++ RequestBase.java 2001/04/26 17:23:34 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v
1.10 2001/04/25 21:39:16 craigmcc Exp $
- * $Revision: 1.10 $
- * $Date: 2001/04/25 21:39:16 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v
1.11 2001/04/26 17:23:34 craigmcc Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/04/26 17:23:34 $
*
* ====================================================================
*
@@ -98,7 +98,7 @@
* the connector-specific methods need to be implemented.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.10 $ $Date: 2001/04/25 21:39:16 $
+ * @version $Revision: 1.11 $ $Date: 2001/04/26 17:23:34 $
*/
public abstract class RequestBase
@@ -965,6 +965,12 @@
* @param value The associated value
*/
public void setAttribute(String name, Object value) {
+
+ // Null value is the same as removeAttribute()
+ if (value == null) {
+ removeAttribute(name);
+ return;
+ }
synchronized (attributes) {
attributes.put(name, value);
1.23 +10 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
Index: ApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ApplicationContext.java 2001/04/26 01:14:02 1.22
+++ ApplicationContext.java 2001/04/26 17:23:35 1.23
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.22 2001/04/26 01:14:02 glenn Exp $
- * $Revision: 1.22 $
- * $Date: 2001/04/26 01:14:02 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.23 2001/04/26 17:23:35 craigmcc Exp $
+ * $Revision: 1.23 $
+ * $Date: 2001/04/26 17:23:35 $
*
* ====================================================================
*
@@ -111,7 +111,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.22 $ $Date: 2001/04/26 01:14:02 $
+ * @version $Revision: 1.23 $ $Date: 2001/04/26 17:23:35 $
*/
public final class ApplicationContext
@@ -865,6 +865,12 @@
* @param value New attribute value to be bound
*/
public void setAttribute(String name, Object value) {
+
+ // Null value is the same as removeAttribute()
+ if (value == null) {
+ removeAttribute(name);
+ return;
+ }
boolean replaced = false;
1.18 +10 -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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- StandardSession.java 2001/04/12 18:18:57 1.17
+++ StandardSession.java 2001/04/26 17:23:36 1.18
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
1.17 2001/04/12 18:18:57 kief Exp $
- * $Revision: 1.17 $
- * $Date: 2001/04/12 18:18:57 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
1.18 2001/04/26 17:23:36 craigmcc Exp $
+ * $Revision: 1.18 $
+ * $Date: 2001/04/26 17:23:36 $
*
* ====================================================================
*
@@ -111,7 +111,7 @@
* @author Craig R. McClanahan
* @author Sean Legassick
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @version $Revision: 1.17 $ $Date: 2001/04/12 18:18:57 $
+ * @version $Revision: 1.18 $ $Date: 2001/04/26 17:23:36 $
*/
class StandardSession
@@ -1012,6 +1012,12 @@
* invalidated session
*/
public void setAttribute(String name, Object value) {
+
+ // Null value is the same as removeAttribute()
+ if (value == null) {
+ removeAttribute(name);
+ return;
+ }
// Validate our current state
if (!isValid)
