ZOOKEEPER-3865: fix backward-compatibility for ZooKeeperServer constr…

…uctor In the fix of ZOOKEEPER-3829 I accidentally changed a public constructor of ZooKeeper server. I didn’t realize Curator is using it for testing (and maybe other Apache projects are doing so as well). In this PR I restore the original constructor for master and branch-3.6. For branch-3.5 I will submit an other PR, that will make it compatible with e.g. Curator 4.3. Author: Mate Szalay-Beko <[email protected]> Reviewers: Enrico Olivelli <[email protected]> Closes apache#1382 from symat/ZOOKEEPER-3865
listatree · Jun 19, 2020 · f6c9bac · f6c9bac
1 parent 8da9c72
commit f6c9bac
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java
@@ -301,7 +301,14 @@ public ZooKeeperServer() {
     }
 
     /**
-     * Creates a ZooKeeperServer instance. It sets everything up, but doesn't
+     * Keeping this constructor for backward compatibility
+     */
+    public ZooKeeperServer(FileTxnSnapLog txnLogFactory, int tickTime, int minSessionTimeout, int maxSessionTimeout, int clientPortListenBacklog, ZKDatabase zkDb, String initialConfig) {
+        this(txnLogFactory, tickTime, minSessionTimeout, maxSessionTimeout, clientPortListenBacklog, zkDb, initialConfig, QuorumPeerConfig.isReconfigEnabled());
+    }
+
+    /**
+     *  * Creates a ZooKeeperServer instance. It sets everything up, but doesn't
      * actually start listening for clients until run() is invoked.
      *
      */