You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2014/03/12 05:16:11 UTC
svn commit: r1576576 - in /tomcat/trunk:
java/org/apache/catalina/manager/ManagerServlet.java
webapps/docs/changelog.xml
Author: kfujino
Date: Wed Mar 12 04:16:11 2014
New Revision: 1576576
URL: http://svn.apache.org/r1576576
Log:
Add support for LAST_ACCESS_AT_START system property to Manager web application.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1576576&r1=1576575&r2=1576576&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Wed Mar 12 04:16:11 2014
@@ -45,6 +45,7 @@ import org.apache.catalina.Container;
import org.apache.catalina.ContainerServlet;
import org.apache.catalina.Context;
import org.apache.catalina.Engine;
+import org.apache.catalina.Globals;
import org.apache.catalina.Host;
import org.apache.catalina.Manager;
import org.apache.catalina.Server;
@@ -156,6 +157,18 @@ public class ManagerServlet extends Http
private static final long serialVersionUID = 1L;
+ protected static final boolean LAST_ACCESS_AT_START;
+
+ static {
+ String lastAccessAtStart = System.getProperty(
+ "org.apache.catalina.session.StandardSession.LAST_ACCESS_AT_START");
+ if (lastAccessAtStart == null) {
+ LAST_ACCESS_AT_START = Globals.STRICT_SERVLET_COMPLIANCE;
+ } else {
+ LAST_ACCESS_AT_START =
+ Boolean.valueOf(lastAccessAtStart).booleanValue();
+ }
+ }
// ----------------------------------------------------- Instance Variables
@@ -1170,7 +1183,12 @@ public class ManagerServlet extends Http
int expired = 0;
long now = System.currentTimeMillis();
for (int i = 0; i < sessions.length; i++) {
- int time = (int)((now-sessions[i].getThisAccessedTimeInternal())/1000);
+ int time;
+ if (LAST_ACCESS_AT_START) {
+ time = (int) ((now - sessions[i].getLastAccessedTimeInternal()) / 1000L);
+ } else {
+ time = (int) ((now - sessions[i].getThisAccessedTimeInternal()) / 1000L);
+ }
if (idle >= 0 && time >= idle*60) {
sessions[i].expire();
expired++;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1576576&r1=1576575&r2=1576576&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Mar 12 04:16:11 2014
@@ -179,6 +179,10 @@
"Expire sessions" command in the manager web application on a
context where the session timeout is disabled. (kfujino)
</fix>
+ <fix>
+ Add support for <code>LAST_ACCESS_AT_START</code> system property to
+ Manager web application. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org