Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

warn if did not read until EOF once per MessageInputStream

This commit is contained in:
Lachlan Roberts 2020-10-07 15:41:51 +11:00
parent 6c94ef5848
commit 7df0dfa7c2
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java
View File

@ -87,7 +87,6 @@ public class MessageInputStream extends InputStream implements MessageAppender
switch (state)
{
case CLOSED:
LOG.warn("Received content after InputStream closed");
return;
case RESUMED:
@ -119,11 +118,16 @@ public class MessageInputStream extends InputStream implements MessageAppender
if (state == State.CLOSED)
return;
if (!buffers.isEmpty() || (activeBuffer != null && activeBuffer.hasRemaining()))
LOG.warn("InputStream closed without fully consuming content");
boolean remainingContent = (state != State.COMPLETE) ||
(!buffers.isEmpty() && buffers.peek() != EOF) ||
(activeBuffer != null && activeBuffer.hasRemaining());
if (remainingContent)
LOG.warn("MessageInputStream closed without fully consuming content");
state = State.CLOSED;
buffers.clear();
buffers.add(EOF);
}
}
@ -155,19 +159,13 @@ public class MessageInputStream extends InputStream implements MessageAppender
public void handlerComplete()
{
// Close the InputStream.
close();
// May need to resume to resume and read to the next message.
SuspendToken resume;
synchronized (this)
{
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;
}