From 9e0324345de5474b45011d652f19df2b11449b90 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 25 May 2009 22:26:34 +0000
Subject: [PATCH] Stop access count going negative when session is swapped in.
 This fix is required for the fix for bug 43343.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@778523 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/session/PersistentManagerBase.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java b/java/org/apache/catalina/session/PersistentManagerBase.java
index 9d5334b12..c2b5c426b 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -816,6 +816,9 @@ public abstract class PersistentManagerBase
         ((StandardSession)session).tellNew();
         add(session);
         ((StandardSession)session).activate();
+        // endAccess() to ensure timeouts happen correctly.
+        // access() to keep access count correct or it will end up negative
+        session.access();
         session.endAccess();
 
         return (session);
-- 
2.11.0