From 3ed97e4f73fadfb72c9ce38bca595363671058e2 Mon Sep 17 00:00:00 2001
From: Michael Edgar <medgar@redhat.com>
Date: Thu, 12 Sep 2024 18:08:34 -0400
Subject: [PATCH] ZOOKEEPER-4293: Bump netty to 4.1.113.Final, remove
 syncUninterruptibly

Signed-off-by: Michael Edgar <medgar@redhat.com>
---
 pom.xml                                                         | 2 +-
 .../main/java/org/apache/zookeeper/ClientCnxnSocketNetty.java   | 2 +-
 .../org/apache/zookeeper/server/quorum/UnifiedServerSocket.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2fbab352667..ecc6eecc183 100644
--- a/pom.xml
+++ b/pom.xml
@@ -559,7 +559,7 @@
     <mockito.version>4.9.0</mockito.version>
     <hamcrest.version>2.2</hamcrest.version>
     <commons-cli.version>1.5.0</commons-cli.version>
-    <netty.version>4.1.105.Final</netty.version>
+    <netty.version>4.1.113.Final</netty.version>
     <jetty.version>9.4.53.v20231009</jetty.version>
     <jackson.version>2.15.2</jackson.version>
     <jline.version>2.14.6</jline.version>
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxnSocketNetty.java b/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxnSocketNetty.java
index 5b82c37f9da..32379e74c30 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxnSocketNetty.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxnSocketNetty.java
@@ -203,7 +203,7 @@ void cleanup() {
                 connectFuture = null;
             }
             if (channel != null) {
-                channel.close().syncUninterruptibly();
+                channel.close();
                 channel = null;
             }
         } finally {
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/UnifiedServerSocket.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/UnifiedServerSocket.java
index 387a6c7d765..c101e9e2dc5 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/UnifiedServerSocket.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/UnifiedServerSocket.java
@@ -255,7 +255,7 @@ private void detectMode() throws IOException {
                 bytesRead = 0;
             }
 
-            if (bytesRead == litmus.length && SslHandler.isEncrypted(Unpooled.wrappedBuffer(litmus))) {
+            if (bytesRead == litmus.length && SslHandler.isEncrypted(Unpooled.wrappedBuffer(litmus), false)) {
                 try {
                     sslSocket = x509Util.createSSLSocket(prependableSocket, litmus);
                 } catch (X509Exception e) {