[tomcat] branch master updated: Added extension point for custom delta requests

[schultz]

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

schultz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new bf2447b  Added extension point for custom delta requests
     new f124a9c  Merge pull request #240 from ThStock/master
bf2447b is described below

commit bf2447b4bd9edda25e00c7aaab9fcce455c43f2f
Author: Thomas Stock <tst...@novomind.com>
AuthorDate: Thu Feb 13 12:55:32 2020 +0100

    Added extension point for custom delta requests
---
 java/org/apache/catalina/ha/session/DeltaSession.java | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java 
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 2465c60..7ea3e1c 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -106,7 +106,15 @@ public class DeltaSession extends StandardSession 
implements Externalizable,Clus
         super(manager);
         boolean recordAllActions = manager instanceof ClusterManagerBase &&
                 ((ClusterManagerBase)manager).isRecordAllActions();
-        deltaRequest = new DeltaRequest(getIdInternal(), recordAllActions);
+        deltaRequest = createRequest(getIdInternal(), recordAllActions);
+    }
+
+    private DeltaRequest createRequest() {
+        return createRequest(null, false);
+    }
+
+    protected DeltaRequest createRequest(String sessionId, boolean 
recordAllActions) {
+        return new DeltaRequest(sessionId, recordAllActions);
     }
 
     // ----------------------------------------------------- ReplicatedMapEntry
@@ -145,10 +153,10 @@ public class DeltaSession extends StandardSession 
implements Externalizable,Clus
             deltaRequestPool = ((ClusterManagerBase) 
manager).getDeltaRequestPool();
             newDeltaRequest = deltaRequestPool.pop();
             if (newDeltaRequest == null) {
-                newDeltaRequest = new DeltaRequest(null, ((ClusterManagerBase) 
manager).isRecordAllActions());
+                newDeltaRequest = createRequest(null, ((ClusterManagerBase) 
manager).isRecordAllActions());
             }
         } else {
-            newDeltaRequest = new DeltaRequest();
+            newDeltaRequest = createRequest();
         }
 
         DeltaRequest oldDeltaRequest = replaceDeltaRequest(newDeltaRequest);
@@ -679,7 +687,7 @@ public class DeltaSession extends StandardSession 
implements Externalizable,Clus
 
             DeltaRequest newDeltaRequest = deltaRequestPool.pop();
             if (newDeltaRequest == null) {
-                newDeltaRequest = new DeltaRequest(null, ((ClusterManagerBase) 
manager).isRecordAllActions());
+                newDeltaRequest = createRequest(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