Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 29655 invoked from network); 11 Apr 2010 20:51:38 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 11 Apr 2010 20:51:38 -0000 Received: (qmail 8546 invoked by uid 500); 11 Apr 2010 20:51:37 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 8487 invoked by uid 500); 11 Apr 2010 20:51:37 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 8478 invoked by uid 99); 11 Apr 2010 20:51:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Apr 2010 20:51:37 +0000 X-ASF-Spam-Status: No, hits=-1194.6 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Apr 2010 20:51:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CCB9C23888E4; Sun, 11 Apr 2010 20:51:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r932989 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Date: Sun, 11 Apr 2010 20:51:16 -0000 To: dev@tomcat.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100411205116.CCB9C23888E4@eris.apache.org> Author: rjung Date: Sun Apr 11 20:51:16 2010 New Revision: 932989 URL: http://svn.apache.org/viewvc?rev=932989&view=rev Log: Use spec compliant session expiration in STRICT_SERVLET_COMPLIANCE mode. Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=932989&r1=932988&r2=932989&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Sun Apr 11 20:51:16 2010 @@ -598,7 +598,12 @@ public class StandardSession if (maxInactiveInterval >= 0) { long timeNow = System.currentTimeMillis(); - int timeIdle = (int) ((timeNow - thisAccessedTime) / 1000L); + int timeIdle; + if (Globals.STRICT_SERVLET_COMPLIANCE) { + timeIdle = (int) ((timeNow - lastAccessedTime) / 1000L); + } else { + timeIdle = (int) ((timeNow - thisAccessedTime) / 1000L); + } if (timeIdle >= maxInactiveInterval) { expire(true); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org