[tomcat] 05/06: Ensure DeltaRequest is created with correct recordAllActions value

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit b199c4beffc8527f627e47f4474e0a10055ab688
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed May 22 09:11:43 2019 +0100

    Ensure DeltaRequest is created with correct recordAllActions value
---
 java/org/apache/catalina/ha/session/DeltaManager.java | 2 +-
 java/org/apache/catalina/ha/session/DeltaSession.java | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java 
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 84a3b16..25b3f96 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -983,7 +983,7 @@ public class DeltaManager extends ClusterManagerBase{
             DeltaRequest newDeltaRequest = deltaRequestPool.pop();
             if (newDeltaRequest == null) {
                 // Will be configured in replaceDeltaRequest()
-                newDeltaRequest = new DeltaRequest();
+                newDeltaRequest = new DeltaRequest(null, isRecordAllActions());
             }
             deltaRequest = session.replaceDeltaRequest(newDeltaRequest);
             if (deltaRequest.getSize() > 0) {
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java 
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 35d17d8..4cf78b3 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -144,8 +144,10 @@ public class DeltaSession extends StandardSession 
implements Externalizable,Clus
         if (manager instanceof ClusterManagerBase) {
             deltaRequestPool = ((ClusterManagerBase) 
manager).getDeltaRequestPool();
             newDeltaRequest = deltaRequestPool.pop();
-        }
-        if (newDeltaRequest == null) {
+            if (newDeltaRequest == null) {
+                newDeltaRequest = new DeltaRequest(null, ((ClusterManagerBase) 
manager).isRecordAllActions());
+            }
+        } else {
             newDeltaRequest = new DeltaRequest();
         }
 
@@ -687,7 +689,7 @@ public class DeltaSession extends StandardSession 
implements Externalizable,Clus
 
             DeltaRequest newDeltaRequest = deltaRequestPool.pop();
             if (newDeltaRequest == null) {
-                newDeltaRequest = new DeltaRequest();
+                newDeltaRequest = new DeltaRequest(null, ((ClusterManagerBase) 
manager).isRecordAllActions());
             }
 
             ReplicationStream ois = ((ClusterManagerBase) 
manager).getReplicationStream(delta);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org