Fixes #4444 - Connection timeout intermittently when using jetty 9.4.25.

Fixed write in doShutdownOutput() by updating the state before the write, so that needsFillInterest() can check whether to also do a write or not. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · Dec 30, 2019 · d5e962e · d5e962e
1 parent 5794584
commit d5e962e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
@@ -1284,9 +1284,26 @@ public void doShutdownOutput()
                     {
                         // If we still can't flush, but we are not closing the endpoint,
                         // let's just flush the encrypted output in the background.
-                        ByteBuffer write = _encryptedOutput;
-                        if (BufferUtil.hasContent(write))
-                            endPoint.write(Callback.from(Callback.NOOP::succeeded, t -> endPoint.close()), write);
+                        ByteBuffer write = null;
+                        synchronized (_decryptedEndPoint)
+                        {
+                            if (BufferUtil.hasContent(_encryptedOutput))
+                            {
+                                write = _encryptedOutput;
+                                _flushState = FlushState.WRITING;
+                            }
+                        }
+                        if (write != null)
+                        {
+                            endPoint.write(Callback.from(() ->
+                            {
+                                synchronized (_decryptedEndPoint)
+                                {
+                                    _flushState = FlushState.IDLE;
+                                    releaseEncryptedOutputBuffer();
+                                }
+                            }, t -> endPoint.close()), write);
+                        }
                     }
                 }
 

diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java
@@ -485,9 +485,6 @@ public void testBlockedClose() throws Exception
                 server.configureBlocking(false);
                 _manager.accept(server);
 
-                //__startBlocking.set(5);
-                //__blockFor.set(3);
-
                 client.getOutputStream().write("Short".getBytes(StandardCharsets.UTF_8));
                 byte[] buffer = new byte[1024];
                 int len = client.getInputStream().read(buffer);
@@ -515,7 +512,7 @@ public void testBlockedClose() throws Exception
                 assertTrue(__onIncompleteFlush.get());
                 ((TestEP)_lastEndp).getWriteFlusher().completeWrite();
                 len = client.getInputStream().read(buffer);
-                assertThat(len, is(len));
+                assertThat(len, is(-1));
             }
         }
     }