- Fix NPE on isValid for an expired session when activity check is enabled.

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

diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index 7de7d23..fcec6ee 100644 (file)
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -710,7 +710,9 @@ public class StandardSession
                     }
                 }
             }
-            accessCount = null;
+            if (ACTIVITY_CHECK) {
+                accessCount.set(0);
+            }
             setValid(false);
 
             /*