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

406617 Spin in Request.recylce 

removed loop from read, so only a single attempt a blocking for content.
This commit is contained in:
Greg Wilkins 2013-05-02 12:57:48 +10:00
parent 92a39fcb08
commit 22b0098be7
2 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
View File

@ -561,6 +561,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http
if (getEndPoint().isInputShutdown())
{
_parser.shutdownInput();
shutdown();
return;
}

55
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
View File

@ -96,32 +96,53 @@ public abstract class HttpInput<T> extends ServletInputStream
T item = null;
synchronized (lock())
{
while (item == null)
// Get the current head of the input Q
item = _inputQ.peekUnsafe();
// Skip empty items at the head of the queue
while (item != null && remaining(item) == 0)
{
_inputQ.pollUnsafe();
onContentConsumed(item);
LOG.debug("{} consumed {}", this, item);
item = _inputQ.peekUnsafe();
while (item != null && remaining(item) == 0)
// If that was the last item then notify
if (item==null)
onAllContentConsumed();
}
// If we have no item
if (item == null)
{
// Was it unexpectedly EOF'd?
if (isEarlyEOF())
throw new EofException();
// check for EOF
if (isShutdown())
{
_inputQ.pollUnsafe();
onContentConsumed(item);
LOG.debug("{} consumed {}", this, item);
item = _inputQ.peekUnsafe();
onEOF();
return -1;
}
if (item == null)
// OK then block for some more content
blockForContent();
// If still not content, we must be closed
item = _inputQ.peekUnsafe();
if (item==null)
{
onAllContentConsumed();
if (isEarlyEOF())
throw new EofException();
// blockForContent will only return with no
// content if it is closed.
if (!isShutdown())
LOG.warn("unexpected !EOF state");
// check for EOF
if (isShutdown())
{
onEOF();
return -1;
}
blockForContent();
onEOF();
return -1;
}
}
}