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

Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
This commit is contained in:
Greg Wilkins 2014-10-26 17:40:16 +11:00
parent 34a8da2ba2 d13cdf2592
commit fbc131b46e
1 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
View File

@ -96,7 +96,6 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
private final HttpChannelState _state;
private final Request _request;
private final Response _response;
private MetaData.Response _committedInfo;
private RequestLog _requestLog;
/** Bytes written after interception (eg after compression) */
@ -230,7 +229,6 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
_committed.set(false);
_request.recycle();
_response.recycle();
_committedInfo=null;
_requestLog=null;
_written=0;
}
@ -387,6 +385,36 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
}
}
if (action==Action.COMPLETE)
{
try
{
_state.completed();
if (!_response.isCommitted() && !_request.isHandled())
{
_response.sendError(404);
}
else
{
// Complete generating the response
_response.closeOutput();
}
}
catch(EofException|ClosedChannelException e)
{
LOG.debug(e);
}
catch(Exception e)
{
LOG.warn("complete failed",e);
}
finally
{
_request.setHandled(true);
onCompleted();
}
}
}
finally
{
@ -395,37 +423,6 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
Thread.currentThread().setName(threadName);
}
if (action==Action.COMPLETE)
{
try
{
_state.completed();
if (!_response.isCommitted() && !_request.isHandled())
{
_response.sendError(404);
}
else
{
// Complete generating the response
_response.closeOutput();
}
}
catch(EofException|ClosedChannelException e)
{
LOG.debug(e);
}
catch(Exception e)
{
LOG.warn("complete failed",e);
}
finally
{
_request.setHandled(true);
onCompleted();
}
}
if (LOG.isDebugEnabled())
LOG.debug("{} handle exit, result {}", this, action);