This is an automated email from the ASF dual-hosted git repository. markt-asf pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 539173a3c1825715f7527c253b69a65e3b595216 Author: Mark Thomas <[email protected]> AuthorDate: Wed Oct 7 14:53:52 2026 +0100 Follow-up to "Fix session histogram unlimited time bucket..." --- java/org/apache/catalina/Session.java | 4 ++-- java/org/apache/catalina/ha/session/DeltaManager.java | 2 +- java/org/apache/catalina/ha/session/DeltaSession.java | 2 +- java/org/apache/catalina/manager/ManagerServlet.java | 4 ++-- java/org/apache/catalina/session/StandardSession.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java/org/apache/catalina/Session.java b/java/org/apache/catalina/Session.java index 03b1ffdb72..9762df102c 100644 --- a/java/org/apache/catalina/Session.java +++ b/java/org/apache/catalina/Session.java @@ -212,7 +212,7 @@ public interface Session { /** * Returns the maximum time interval, in seconds, between client requests before the servlet container will - * invalidate the session. A negative time indicates that the session should never time out. + * invalidate the session. A zero or negative time indicates that the session should never time out. * * @return the maximum inactive interval in seconds */ @@ -221,7 +221,7 @@ public interface Session { /** * Set the maximum time interval, in seconds, between client requests before the servlet container will invalidate - * the session. A negative time indicates that the session should never time out. + * the session. A zero or negative time indicates that the session should never time out. * * @param interval The new maximum interval */ diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java index 36c0c61d0b..f1afae4989 100644 --- a/java/org/apache/catalina/ha/session/DeltaManager.java +++ b/java/org/apache/catalina/ha/session/DeltaManager.java @@ -1085,7 +1085,7 @@ 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 (session.getMaxInactiveInterval() >= 0 && replDelta > (session.getMaxInactiveInterval() * 1000L)) { + if (session.getMaxInactiveInterval() > 0 && replDelta > (session.getMaxInactiveInterval() * 1000L)) { if (enableStatistics) { counterSend_EVT_SESSION_ACCESSED.incrementAndGet(); } diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java b/java/org/apache/catalina/ha/session/DeltaSession.java index 1d8dbe601c..6e7dc8e1e2 100644 --- a/java/org/apache/catalina/ha/session/DeltaSession.java +++ b/java/org/apache/catalina/ha/session/DeltaSession.java @@ -275,7 +275,7 @@ public class DeltaSession extends StandardSession implements Externalizable, Clu public boolean isAccessReplicate() { long replDelta = System.currentTimeMillis() - getLastTimeReplicated(); int maxInactiveInterval = getMaxInactiveInterval(); - return maxInactiveInterval >= 0 && replDelta > (maxInactiveInterval * 1000L); + return maxInactiveInterval > 0 && replDelta > (maxInactiveInterval * 1000L); } @Override diff --git a/java/org/apache/catalina/manager/ManagerServlet.java b/java/org/apache/catalina/manager/ManagerServlet.java index 14801d9dea..71cdb510cb 100644 --- a/java/org/apache/catalina/manager/ManagerServlet.java +++ b/java/org/apache/catalina/manager/ManagerServlet.java @@ -1292,10 +1292,10 @@ public class ManagerServlet extends HttpServlet implements ContainerServlet { session.expire(); expired++; } - // Negative interval: session never times out (a context + // Non-positive interval: session never times out (a context // session timeout of zero is stored as -1 minutes which // becomes -60 seconds on the session) - if (session.getMaxInactiveInterval() < 0) { + if (session.getMaxInactiveInterval() <= 0) { notimeout++; } else { // Clamp negative idle time (system clock went backwards) diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java index 55c2bd6080..e323cfceae 100644 --- a/java/org/apache/catalina/session/StandardSession.java +++ b/java/org/apache/catalina/session/StandardSession.java @@ -165,7 +165,7 @@ public class StandardSession implements HttpSession, Session, Serializable { /** * The maximum time interval, in seconds, between client requests before the servlet container may invalidate this - * session. A negative time indicates that the session should never time out. + * session. A zero or negative time indicates that the session should never time out. */ protected volatile int maxInactiveInterval = -1; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
