From 42e3713005982b4a0d64b72543e425ee12cef70f Mon Sep 17 00:00:00 2001
From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 18 Oct 2006 10:13:28 +0000
Subject: [PATCH] - 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
---
 java/org/apache/catalina/session/StandardSession.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index 7de7d23e4..fcec6ee9a 100644
--- 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);
 
             /*
-- 
2.11.0