Issue #4217 - Fixing OVERFLOW case to allow flush()

Signed-off-by: Joakim Erdfelt <[email protected]>
jetty · Oct 30, 2019 · f7ab02a · f7ab02a
1 parent c980e3d
commit f7ab02a
Showing 1 changed file with 8 additions and 4 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
@@ -879,6 +879,9 @@ public synchronized 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
@@ -892,12 +895,13 @@ public synchronized boolean flush(ByteBuffer... appOuts) throws IOException
                                 releaseEncryptedOutputBuffer();
                                 continue;
                             }
-                            throw new IllegalStateException("Unexpected wrap result " + wrapResultStatus);
+                            if (BufferUtil.isEmpty(_encryptedOutput))
+                            {
+                                throw new IllegalStateException("Unexpected wrap result " + wrapResultStatus);
+                            }
+                            // fall-through default case to flush()
                         }
 
-                        case BUFFER_UNDERFLOW:
-                            throw new IllegalStateException();
-
                         default:
                             if (DEBUG)
                                 LOG.debug("{} {} {}", this, wrapResultStatus, BufferUtil.toDetailString(_encryptedOutput));