billbarker 2004/01/02 19:46:38
Modified: util/java/org/apache/tomcat/util/buf TimeStamp.java
util/java/org/apache/tomcat/util/threads Expirer.java
Log:
Fix session-expiring test to be like 5.0.
Even though these classes live in j-t-c, AFAIK, they are only used by Tomcat 3.3.x.
Fix for Bug #10039
Reported By: ryo nakamura nakamura@zyuon.co.jp
Revision Changes Path
1.5 +4 -0 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/TimeStamp.java
Index: TimeStamp.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/TimeStamp.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TimeStamp.java 2 Sep 2003 21:34:38 -0000 1.4
+++ TimeStamp.java 3 Jan 2004 03:46:38 -0000 1.5
@@ -146,6 +146,10 @@
return lastAccessedTime;
}
+ public long getThisAccessedTime() {
+ return thisAccessedTime;
+ }
+
/** Inactive interval in millis - the time is computed
* in millis, convert to secs in the upper layer
*/
1.6 +1 -1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/Expirer.java
Index: Expirer.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/Expirer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Expirer.java 2 Sep 2003 21:34:38 -0000 1.5
+++ Expirer.java 3 Jan 2004 03:46:38 -0000 1.6
@@ -176,7 +176,7 @@
if (maxInactiveInterval < 0)
continue;
- long timeIdle = timeNow - ts.getLastAccessedTime();
+ long timeIdle = timeNow - ts.getThisAccessedTime();
if (timeIdle >= maxInactiveInterval) {
if( expireCallback != null ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
|