Notifications of changes in session ID to other nodes in the cluster should be contro...

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

diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java
index 9521272..e71f9c9 100644 (file)
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -1463,7 +1463,7 @@ public CatalinaCluster getCluster() {
         if (session != null) {
             String newSessionID = deserializeSessionId(msg.getSession());
             session.setPrimarySession(false);
-            session.setId(newSessionID, notifyListenersOnReplication);
+            session.setId(newSessionID, notifySessionListenersOnReplication);
         }
     }
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f1e9be8..b2628e0 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -217,6 +217,11 @@
         <bug>51306</bug>: Avoid NPE when handleSESSION_EXPIRED is processed 
         while handleSESSION_CREATED is being processed. (kfujino)
       </fix>
+      <fix>
+        Notifications of changes in session ID to other nodes in the cluster
+        should be controlled by notifySessionListenersOnReplication rather than
+        notifyListenersOnReplication. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Web applications">