Fix bug 43216: Set correct StandardSession#accessCount as StandardSession.ACTIVITY_CH...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@570417 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/session/StandardManager.java b/java/org/apache/catalina/session/StandardManager.java
index 23dea93..aff2a03 100644 (file)
--- 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 72ceb29..ae22508 100644 (file)
--- 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">