From 787a8a35952d493e0b229f8b08c177568cb37046 Mon Sep 17 00:00:00 2001 From: kfujino Date: Thu, 21 Oct 2010 10:15:26 +0000 Subject: [PATCH] Improve sending an access message in DeltaManager. maxInactiveInterval of not Manager but the session is used. If maxInactiveInterval is negative, an access message is not sending. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1025924 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/ha/session/DeltaManager.java | 3 ++- webapps/docs/changelog.xml | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java index 820594ec7..7e4d27813 100644 --- a/java/org/apache/catalina/ha/session/DeltaManager.java +++ b/java/org/apache/catalina/ha/session/DeltaManager.java @@ -1078,7 +1078,8 @@ public class DeltaManager extends ClusterManagerBase{ //check to see if we need to send out an access message if (!expires && (msg == null)) { long replDelta = System.currentTimeMillis() - session.getLastTimeReplicated(); - if (replDelta > (getMaxInactiveInterval() * 1000)) { + if (session.getMaxInactiveInterval() >=0 && + replDelta > (session.getMaxInactiveInterval() * 1000)) { counterSend_EVT_SESSION_ACCESSED++; msg = new SessionMessageImpl(getName(), SessionMessage.EVT_SESSION_ACCESSED, diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 66228d558..cf4fd8105 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -78,6 +78,12 @@ Add support for maxActiveSessions attributes to BackupManager. (kfujino) + + Improve sending an access message in DeltaManager. + maxInactiveInterval of not Manager but the session is used. + If maxInactiveInterval is negative, an access message is not sending. + (kfujino) + -- 2.11.0