Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-04 21:09:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

move logic from messageComplete into appendFrame with fin==true

Browse Source 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2020-10-14 10:26:08 +11:00
parent 09947681fe
commit 419eefc2ef
1 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,31 +77,42 @@ public class MessageInputStream extends InputStream implements MessageAppender
if (LOG.isDebugEnabled())
LOG.debug("Appending {} chunk: {}", fin ? "final" : "non-final", BufferUtil.toDetailString(framePayload));
// Avoid entering synchronized block if there is nothing to do.
boolean bufferIsEmpty = BufferUtil.isEmpty(framePayload);
if (bufferIsEmpty && !fin)
return;
try
{
if (BufferUtil.isEmpty(framePayload))
return;
synchronized (this)
{
switch (state)
if (!bufferIsEmpty)
{
case CLOSED:
return;
switch (state)
{
case CLOSED:
return;
case RESUMED:
suspendToken = session.suspend();
state = State.SUSPENDED;
break;
case RESUMED:
suspendToken = session.suspend();
state = State.SUSPENDED;
break;
default:
throw new IllegalStateException();
default:
throw new IllegalStateException();
}
// Put the payload into the queue, by copying it.
// Copying is necessary because the payload will
// be processed after this method returns.
buffers.put(copy(framePayload));
}
// Put the payload into the queue, by copying it.
// Copying is necessary because the payload will
// be processed after this method returns.
buffers.put(copy(framePayload));
if (fin)
{
buffers.add(EOF);
state = State.COMPLETE;
}
}
}
catch (InterruptedException e)
@ -131,32 +142,6 @@ public class MessageInputStream extends InputStream implements MessageAppender
}
}
@Override
public void messageComplete()
{
if (LOG.isDebugEnabled())
LOG.debug("Message completed");
synchronized (this)
{
switch (state)
{
case CLOSED:
return;
case SUSPENDED:
case RESUMED:
state = State.COMPLETE;
break;
default:
throw new IllegalStateException();
}
buffers.offer(EOF);
}
}
public void handlerComplete()
{
// Close the InputStream.
@ -202,6 +187,7 @@ public class MessageInputStream extends InputStream implements MessageAppender
return -1;
}
// todo: what if we get a buffer with no content and we never resume
// grab a fresh buffer
while (activeBuffer == null || !activeBuffer.hasRemaining())
{
@ -279,6 +265,12 @@ public class MessageInputStream extends InputStream implements MessageAppender
}
}
@Override
public void messageComplete()
{
// We handle this case in appendFrame with fin==true.
}
@Override
public void reset() throws IOException
{