This is an automated email from the ASF dual-hosted git repository.
kezhuw pushed a commit to branch branch-3.9
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.9 by this push:
new ea8bd41e6 ZOOKEEPER-4736: [ADDENDUM] Fix compilation failure
introduced in backport (#2337)
ea8bd41e6 is described below
commit ea8bd41e62ff321e82afbbcd858990a46b7f68db
Author: Kezhu Wang <[email protected]>
AuthorDate: Fri Nov 14 00:23:27 2025 +0800
ZOOKEEPER-4736: [ADDENDUM] Fix compilation failure introduced in backport
(#2337)
This is a fixup commit to 40a07c901f4db61302edf1191e417f9f3f723d95.
---
.../test/java/org/apache/zookeeper/ClientCnxnSocketFragilityTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/ClientCnxnSocketFragilityTest.java
b/zookeeper-server/src/test/java/org/apache/zookeeper/ClientCnxnSocketFragilityTest.java
index 7471c9d30..8c4d5e194 100644
---
a/zookeeper-server/src/test/java/org/apache/zookeeper/ClientCnxnSocketFragilityTest.java
+++
b/zookeeper-server/src/test/java/org/apache/zookeeper/ClientCnxnSocketFragilityTest.java
@@ -96,7 +96,7 @@ public void testSocketClosedAfterFailure() throws Exception {
BusyServer server = new BusyServer();
ZooKeeper zk = new ZooKeeper(server.getHostPort(), (int)
sessionTimeout.toMillis(), null) {
@Override
- ClientCnxn createConnection(HostProvider hostProvider, int
sessionTimeout, ZKClientConfig clientConfig, Watcher defaultWatcher,
ClientCnxnSocket clientCnxnSocket, long sessionId, byte[] sessionPasswd,
boolean canBeReadOnly) throws IOException {
+ ClientCnxn createConnection(String chrootPath, HostProvider
hostProvider, int sessionTimeout, ZKClientConfig clientConfig, Watcher
defaultWatcher, ClientCnxnSocket clientCnxnSocket, boolean canBeReadOnly)
throws IOException {
ClientCnxnSocketNIO socket = spy((ClientCnxnSocketNIO)
clientCnxnSocket);
doAnswer(mock -> {
@@ -110,7 +110,7 @@ ClientCnxn createConnection(HostProvider hostProvider, int
sessionTimeout, ZKCli
}).when(socket).createSock();
nioSelector.set(socket.getSelector());
- return super.createConnection(hostProvider,
sessionTimeout, clientConfig, defaultWatcher, socket, sessionId, sessionPasswd,
canBeReadOnly);
+ return super.createConnection(chrootPath, hostProvider,
sessionTimeout, clientConfig, defaultWatcher, socket, canBeReadOnly);
}
}) {