ZOOKEEPER-4293: Bump netty to 4.1.113.Final, remove syncUninterruptibly (#1917)

MikeEdgar · web-flow · commit 9df310a9df6e · 2024-09-19T14:31:51.000-05:00
Reviewers: anmolnar, kezhuw Author: MikeEdgar Closes #1917 from MikeEdgar/ZOOKEEPER-4293
diff --git 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
@@ -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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ void cleanup() {`
`203`	`203`	`connectFuture = null;`
`204`	`204`	`}`
`205`	`205`	`if (channel != null) {`
`206`		`- channel.close().syncUninterruptibly();`
	`206`	`+ channel.close();`
`207`	`207`	`channel = null;`
`208`	`208`	`}`
`209`	`209`	`} finally {`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ private void detectMode() throws IOException {`
`255`	`255`	`bytesRead = 0;`
`256`	`256`	`}`
`257`	`257`
`258`		`- if (bytesRead == litmus.length && SslHandler.isEncrypted(Unpooled.wrappedBuffer(litmus))) {`
	`258`	`+ if (bytesRead == litmus.length && SslHandler.isEncrypted(Unpooled.wrappedBuffer(litmus), false)) {`
`259`	`259`	`try {`
`260`	`260`	`sslSocket = x509Util.createSSLSocket(prependableSocket, litmus);`
`261`	`261`	`} catch (X509Exception e) {`