Trying to ensure no blocking close on force reconnect from socket wri…

…te timeout
nats-io · May 31, 2024 · 5f7fa40 · 5f7fa40
1 parent 8a1111c
commit 5f7fa40
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/src/main/java/io/nats/client/impl/NatsConnection.java b/src/main/java/io/nats/client/impl/NatsConnection.java
@@ -284,8 +284,6 @@ public void forceReconnect() throws IOException, InterruptedException {
     }
 
     void forceReconnectImpl() throws IOException, InterruptedException {
-        NatsConnectionWriter oldWriter = writer;
-
         closeSocketLock.lock();
         try {
             updateStatus(Status.DISCONNECTED);
@@ -299,8 +297,7 @@ void forceReconnectImpl() throws IOException, InterruptedException {
                 try {
                     dataPort.close();
                 }
-                catch (IOException ignore) {
-                }
+                catch (IOException ignore) {}
                 finally {
                     dataPort = null;
                 }

diff --git a/src/main/java/io/nats/client/impl/SocketDataPortWithWriteTimeout.java b/src/main/java/io/nats/client/impl/SocketDataPortWithWriteTimeout.java
@@ -38,10 +38,6 @@ public void run() {
             if (System.nanoTime() > writeMustBeDoneBy) {
                 writeWatcherTimer.cancel(); // we don't need to repeat this
                 connection.executeCallback((c, el) -> el.socketWriteTimeout(c));
-                try {
-                    out.close();
-                }
-                catch (IOException ignore) {}
                 connection.getExecutor().submit(() -> {
                     try {
                         connection.forceReconnect();