luehe 2004/03/10 20:18:31
Modified: catalina/src/share/org/apache/catalina/session
StandardSession.java
Log:
Fixed regression re: Bugtraq 4839736
("HttpSession.setMaxInactiveInterval() doesn't behave as expected"),
which had been originally fixed in revision 1.20
Revision Changes Path
1.37 +6 -6
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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- StandardSession.java 4 Mar 2004 17:51:16 -0000 1.36
+++ StandardSession.java 11 Mar 2004 04:18:31 -0000 1.37
@@ -276,7 +276,7 @@
/**
- * The access count for thsi session.
+ * The access count for this session.
*/
protected transient int accessCount = 1;
@@ -555,16 +555,16 @@
return false;
}
- if (accessCount > 0) {
- return true;
- }
-
if (maxInactiveInterval >= 0) {
long timeNow = System.currentTimeMillis();
int timeIdle = (int) ((timeNow - thisAccessedTime) / 1000L);
if (timeIdle >= maxInactiveInterval) {
expire(true);
}
+ }
+
+ if (accessCount > 0) {
+ return true;
}
return (this.isValid);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
