craigmcc 02/01/19 17:40:15
Modified: catalina/src/share/org/apache/catalina/session Tag:
tomcat_40_branch StandardSession.java
Log:
Port from HEAD branch the removal of redundant session attribute
unbinding in the writeObject() method.
Submitted by: David Lecomber <[EMAIL PROTECTED]>
Revision Changes Path
No revision
No revision
1.25.2.1 +5 -14
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.25
retrieving revision 1.25.2.1
diff -u -r1.25 -r1.25.2.1
--- StandardSession.java 31 Jul 2001 02:00:02 -0000 1.25
+++ StandardSession.java 20 Jan 2002 01:40:15 -0000 1.25.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
1.25 2001/07/31 02:00:02 craigmcc Exp $
- * $Revision: 1.25 $
- * $Date: 2001/07/31 02:00:02 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
1.25.2.1 2002/01/20 01:40:15 craigmcc Exp $
+ * $Revision: 1.25.2.1 $
+ * $Date: 2002/01/20 01:40:15 $
*
* ====================================================================
*
@@ -115,7 +115,7 @@
* @author Craig R. McClanahan
* @author Sean Legassick
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @version $Revision: 1.25 $ $Date: 2001/07/31 02:00:02 $
+ * @version $Revision: 1.25.2.1 $ $Date: 2002/01/20 01:40:15 $
*/
class StandardSession
@@ -1316,7 +1316,6 @@
String keys[] = keys();
ArrayList saveNames = new ArrayList();
ArrayList saveValues = new ArrayList();
- ArrayList unbinds = new ArrayList();
for (int i = 0; i < keys.length; i++) {
Object value = null;
synchronized (attributes) {
@@ -1327,8 +1326,7 @@
else if (value instanceof Serializable) {
saveNames.add(keys[i]);
saveValues.add(value);
- } else
- unbinds.add(keys[i]);
+ }
}
// Serialize the attribute count and the Serializable attributes
@@ -1348,14 +1346,7 @@
if (debug >= 2)
log(" storing attribute '" + saveNames.get(i) +
"' with value NOT_SERIALIZED");
- unbinds.add(saveNames.get(i));
}
- }
-
- // Unbind the non-Serializable attributes
- Iterator names = unbinds.iterator();
- while (names.hasNext()) {
- removeAttribute((String) names.next());
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
