From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 17 Oct 2006 20:36:13 +0000 (+0000)
Subject: Fix NPE on session state transfer
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c03057b17f7b8b12ba38d8d9bd6d777cfd795ad5;p=tomcat7.0

Fix NPE on session state transfer


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

diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java b/java/org/apache/catalina/ha/session/DeltaSession.java
index 8ade48d23..683e2da1f 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -698,7 +698,8 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
     }
 
     protected void setAccessCount(int count) {
-        super.accessCount.set(count);
+        if ( accessCount == null && ACTIVITY_CHECK ) accessCount = new AtomicInteger();
+        if ( accessCount != null ) super.accessCount.set(count);
     }
 }