luehe 2004/03/11 11:56:52
Modified: catalina/src/share/org/apache/catalina/session
StandardSession.java
Log:
Reverted previous change, as it breaks the fix for Bugzilla 26051.
Test case for Bugtraq 4839736 (see revision 1.20) is invalid.
Revision Changes Path
1.38 +5 -5
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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- StandardSession.java 11 Mar 2004 04:18:31 -0000 1.37
+++ StandardSession.java 11 Mar 2004 19:56:52 -0000 1.38
@@ -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]
