You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/05/23 09:59:21 UTC
[tomcat] 04/05: Ensure DeltaRequest is created with correct
recordAllActions value
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 46678701d03afa5f254705da15c6232bc2fb88be
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 6c5b3bd..29ed8d2 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -978,7 +978,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 d9afe90..4147fc0 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();
}
@@ -677,7 +679,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org