Issue #5368 - warn if MessageInputStream closed without fully consuming

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · Oct 6, 2020 · 6c94ef5 · 6c94ef5
1 parent 941ffce
commit 6c94ef5
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/...t-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java b/...t-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java
@@ -87,6 +87,7 @@ public void appendFrame(ByteBuffer framePayload, boolean fin) throws IOException
                 switch (state)
                 {
                     case CLOSED:
+                        LOG.warn("Received content after InputStream closed");
                         return;
 
                     case RESUMED:
@@ -118,9 +119,11 @@ public void close()
             if (state == State.CLOSED)
                 return;
 
+            if (!buffers.isEmpty() || (activeBuffer != null && activeBuffer.hasRemaining()))
+                LOG.warn("InputStream closed without fully consuming content");
+
             state = State.CLOSED;
             buffers.clear();
-            buffers.offer(EOF);
         }
     }
 
@@ -156,11 +159,17 @@ public void handlerComplete()
         SuspendToken resume;
         synchronized (this)
         {
-            state = State.CLOSED;
+            if (state != State.CLOSED)
+            {
+                if (!buffers.isEmpty() || (activeBuffer != null && activeBuffer.hasRemaining()))
+                    LOG.warn("InputStream closed without fully consuming content");
+
+                state = State.CLOSED;
+                buffers.clear();
+            }
+
             resume = suspendToken;
             suspendToken = null;
-            buffers.clear();
-            buffers.offer(EOF);
         }
 
         if (resume != null)