From 0741d250cac59ea092634ef05b99560926f188c7 Mon Sep 17 00:00:00 2001
From: rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 11 Apr 2010 15:53:07 +0000
Subject: [PATCH] Ignore request handling time in session lastAccessedTime when
 acting servlet spec compliant.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@932926 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/session/StandardSession.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index 5236e27fb..3d9b3308b 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -643,8 +643,18 @@ public class StandardSession
     public void endAccess() {
 
         isNew = false;
-        this.thisAccessedTime = System.currentTimeMillis();
-        this.lastAccessedTime = this.thisAccessedTime;
+
+        /**
+         * The servlet spec mandates to ignore request handling time
+         * in lastAccessedTime.
+         */
+        if (Globals.STRICT_SERVLET_COMPLIANCE) {
+            this.lastAccessedTime = this.thisAccessedTime;
+            this.thisAccessedTime = System.currentTimeMillis();
+        } else {
+            this.thisAccessedTime = System.currentTimeMillis();
+            this.lastAccessedTime = this.thisAccessedTime;
+        }
 
         if (ACTIVITY_CHECK) {
             accessCount.decrementAndGet();
-- 
2.11.0