Issue jetty#4217 - SslConnection DecryptedEndpoint flush eternal busy…

… loop + Flush on BUFFER_OVERFLOW Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Anda77 · Oct 30, 2019 · c04997f · c04997f
1 parent e137ee3
commit c04997f
Showing 1 changed file with 12 additions and 5 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
@@ -1020,6 +1020,10 @@ public boolean flush(ByteBuffer... appOuts) throws IOException
                                     }
                                     return allConsumed;
                                 }
+                                case BUFFER_UNDERFLOW:
+                                {
+                                    throw new IllegalStateException();
+                                }
                                 case BUFFER_OVERFLOW:
                                 {
                                     // It's possible that SSLSession.packetBufferSize has been expanded
@@ -1033,11 +1037,14 @@ public boolean flush(ByteBuffer... appOuts) throws IOException
                                         releaseEncryptedOutputBuffer();
                                         continue;
                                     }
-                                    throw new IllegalStateException("Unexpected wrap result " + wrapResultStatus);
-                                }
-                                case BUFFER_UNDERFLOW:
-                                {
-                                    throw new IllegalStateException();
+                                    if (BufferUtil.isEmpty(_encryptedOutput))
+                                    {
+                                        throw new IllegalStateException(
+                                            String.format("Unexpected wrap result %s (packetBufferSize %d < getPacketBufferSize() %d)",
+                                                wrapResultStatus, packetBufferSize, getPacketBufferSize()
+                                            ));
+                                    }
+                                    // fall-through default case to flush()
                                 }
                                 default:
                                 {