This is an automated email from the ASF dual-hosted git repository.

rmaucher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 7740966961 Fix inaccurate session expiration stats
7740966961 is described below

commit 77409669611b5801ef619348761899f4f52a5e32
Author: remm <[email protected]>
AuthorDate: Mon May 25 20:48:57 2026 +0200

    Fix inaccurate session expiration stats
    
    Two occurrences of a similar issue.
---
 java/org/apache/catalina/session/PersistentManagerBase.java | 3 +--
 webapps/docs/changelog.xml                                  | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java 
b/java/org/apache/catalina/session/PersistentManagerBase.java
index e67bdbfde4..6b2c8a2129 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -329,7 +329,6 @@ public abstract class PersistentManagerBase extends 
ManagerBase implements Store
         }
         for (Session session : sessions) {
             if (!session.isValid()) {
-                expiredSessions.incrementAndGet();
                 expireHere++;
             }
         }
@@ -654,7 +653,7 @@ public abstract class PersistentManagerBase extends 
ManagerBase implements Store
 
         ((StandardSession) session).passivate();
         writeSession(session);
-        super.remove(session, true);
+        super.remove(session, false);
         session.recycle();
 
     }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 57e645f025..478bd9f56d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -279,6 +279,10 @@
       <fix>
         Fix shared lock expiration in WebDAV. (remm)
       </fix>
+      <fix>
+        Inaccurate session exipration statistics when using the persistent
+        manager. (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to