[geode] branch develop updated: GEODE-7048: Remove dead code in GatewaySenderBatchOp (#3887)

[mhanson]

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

mhanson pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 1bd08bb  GEODE-7048: Remove dead code in GatewaySenderBatchOp (#3887)
1bd08bb is described below

commit 1bd08bbb2d0e2e4e3b01fb3c8c134fd36247e0ce
Author: Alberto Bustamante Reyes <alb3rt...@users.noreply.github.com>
AuthorDate: Fri Aug 9 18:40:01 2019 +0200

    GEODE-7048: Remove dead code in GatewaySenderBatchOp (#3887)
---
 .../geode/cache/client/internal/GatewaySenderBatchOp.java | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git 
a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java
 
b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java
index 33f5293..096d364 100755
--- 
a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java
+++ 
b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java
@@ -22,7 +22,6 @@ import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.InternalGemFireError;
 import org.apache.geode.cache.client.ServerOperationException;
-import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.EventID;
 import org.apache.geode.internal.cache.tier.MessageType;
 import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
@@ -51,18 +50,8 @@ public class GatewaySenderBatchOp {
    */
   public static void executeOn(Connection con, ExecutablePool pool, List 
events, int batchId,
       boolean removeFromQueueOnException, boolean isRetry) {
-    AbstractOp op = null;
-    // System.out.println("Version: "+con.getWanSiteVersion());
-    // Is this check even needed anymore? It looks like we just create the 
same exact op impl with
-    // the same parameters...
-    if (Version.GFE_651.compareTo(con.getWanSiteVersion()) >= 0) {
-      op = new GatewaySenderGFEBatchOpImpl(events, batchId, 
removeFromQueueOnException,
-          con.getDistributedSystemId(), isRetry);
-    } else {
-      // Default should create a batch of server version (ACCEPTOR.VERSION)
-      op = new GatewaySenderGFEBatchOpImpl(events, batchId, 
removeFromQueueOnException,
-          con.getDistributedSystemId(), isRetry);
-    }
+    AbstractOp op = new GatewaySenderGFEBatchOpImpl(events, batchId, 
removeFromQueueOnException,
+        con.getDistributedSystemId(), isRetry);
     pool.executeOn(con, op, true/* timeoutFatal */);
   }