fix BorrowedBuffer deadlock

liubr1491 · Jun 8, 2022 · 485d3f0 · 485d3f0
1 parent 9a61132
commit 485d3f0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/bt-core/src/main/java/bt/net/pipeline/DefaultChannelPipeline.java b/bt-core/src/main/java/bt/net/pipeline/DefaultChannelPipeline.java
@@ -85,14 +85,14 @@ private void fireDataReceived() {
     public boolean encode(Message message) {
         checkHandlerIsBound();
 
-        ByteBuffer buffer = outboundBuffer.lockAndGet();
-        if (buffer == null) {
-            // buffer has been released
-            // TODO: So what? Maybe throw an exception then?
-            return false;
-        }
-
         try {
+            ByteBuffer buffer = outboundBuffer.lockAndGet();
+            if (buffer == null) {
+                // buffer has been released
+                // this may happen in handshake stage when client send EOF, buffer has been released by SocketChannelHandler
+                // TODO: So what? Maybe throw an exception then?
+                return false;
+            }
             return writeMessageToBuffer(message, buffer);
         } finally {
             outboundBuffer.unlock();

diff --git a/bt-core/src/main/java/bt/net/pipeline/SocketChannelHandler.java b/bt-core/src/main/java/bt/net/pipeline/SocketChannelHandler.java
@@ -139,12 +139,13 @@ private boolean processInboundData() throws IOException {
     public void flush() {
         synchronized (outboundBufferLock) {
             ByteBuffer buffer = outboundBuffer.lockAndGet();
-            if (buffer == null) {
-                // buffer has been released
-                return;
-            }
-            buffer.flip();
             try {
+                if (buffer == null) {
+                    // buffer has been released
+                    outboundBuffer.unlock();
+                    return;
+                }
+                buffer.flip();
                 while (buffer.hasRemaining() && !closing) {
                     channel.write(buffer);
                 }