Merge pull request #2964 from HenrikJannsen/do-not-close-socket-from-…

…NetworkEnvelopeSocket Do not close socket from network envelope socket
bisq-network · Oct 29, 2024 · cc4a154 · cc4a154
2 parents 89eb239 + 065fac3
commit cc4a154
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/network/network/src/main/java/bisq/network/p2p/node/Connection.java b/network/network/src/main/java/bisq/network/p2p/node/Connection.java
@@ -318,7 +318,7 @@ AtomicInteger getSentMessageCounter() {
     }
 
     boolean isStopped() {
-        return shutdownStarted;
+        return shutdownStarted || networkEnvelopeSocket.isClosed() || Thread.currentThread().isInterrupted();
     }
 
 

diff --git a/network/network/src/main/java/bisq/network/p2p/node/envelope/NetworkEnvelopeSocket.java b/network/network/src/main/java/bisq/network/p2p/node/envelope/NetworkEnvelopeSocket.java
@@ -39,22 +39,12 @@ public NetworkEnvelopeSocket(PeerSocket socket) {
     }
 
     public void send(NetworkEnvelope networkEnvelope) throws IOException {
-        try {
-            networkEnvelope.writeDelimitedTo(outputStream);
-            outputStream.flush();
-        } catch (IOException e) {
-            close();
-            throw e;
-        }
+        networkEnvelope.writeDelimitedTo(outputStream);
+        outputStream.flush();
     }
 
     public bisq.network.protobuf.NetworkEnvelope receiveNextEnvelope() throws IOException {
-        try {
-            return bisq.network.protobuf.NetworkEnvelope.parseDelimitedFrom(inputStream);
-        } catch (IOException e) {
-            close();
-            throw e;
-        }
+        return bisq.network.protobuf.NetworkEnvelope.parseDelimitedFrom(inputStream);
     }
 
     @Override
-Original file line number
+Diff line change
@@ Expand Up / @@ -318,7 +318,7 @@ AtomicInteger getSentMessageCounter() { @@
         }
         boolean isStopped() {
-            return shutdownStarted;
+            return shutdownStarted || networkEnvelopeSocket.isClosed() || Thread.currentThread().isInterrupted();
         }
@@ Expand Down @@