From bcf64bc3ca920dc3b58556c58df3b156c003dc81 Mon Sep 17 00:00:00 2001
From: pero <pero@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 28 Aug 2007 13:33:18 +0000
Subject: [PATCH] Fix bug 43216: Set correct StandardSession#accessCount as
 StandardSession.ACTIVITY_CHECK is true.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@570417 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/session/StandardManager.java | 1 -
 webapps/docs/changelog.xml                            | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/session/StandardManager.java b/java/org/apache/catalina/session/StandardManager.java
index 23dea937d..aff2a034a 100644
--- a/java/org/apache/catalina/session/StandardManager.java
+++ b/java/org/apache/catalina/session/StandardManager.java
@@ -395,7 +395,6 @@ public class StandardManager
                     session.setManager(this);
                     sessions.put(session.getIdInternal(), session);
                     session.activate();
-                    session.endAccess();
                 }
             } catch (ClassNotFoundException e) {
               log.error(sm.getString("standardManager.loading.cnfe", e), e);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 72ceb29c2..ae225088b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -46,6 +46,10 @@
          stop to fail. Based on a fix suggested by Michael Vorburger.
          Port of r454193 (<bug>36976</bug>) from Tomcat 5.5.x. (markt,rjung)
       </fix>
+      <fix>
+         <bug>43216</bug>: Set correct StandardSession#accessCount as StandardSession.ACTIVITY_CHECK is true.
+          Patch provided by Takayuki Kaneko (pero)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">
-- 
2.11.0