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

fixed bad merge

This commit is contained in:
Greg Wilkins 2014-10-26 20:34:19 +11:00
parent fbc131b46e
commit e19178fd82
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
private final HttpChannelState _state;
private final Request _request;
private final Response _response;
private MetaData.Response _committedMetaData;
private RequestLog _requestLog;
/** Bytes written after interception (eg after compression) */
@ -149,7 +150,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
public MetaData.Response getCommittedInfo()
{
return _committedInfo;
return _committedMetaData;
}
/**
@ -229,6 +230,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
_committed.set(false);
_request.recycle();
_response.recycle();
_committedMetaData=null;
_requestLog=null;
_written=0;
}
@ -526,7 +528,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
public void onCompleted()
{
if (_requestLog!=null )
_requestLog.log(_request,_committedInfo==null?-1:_committedInfo.getStatus(), _written);
_requestLog.log(_request,_committedMetaData==null?-1:_committedMetaData.getStatus(), _written);
_transport.completed();
}
@ -616,7 +618,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
protected void commit (MetaData.Response info)
{
_committedInfo=info;
_committedMetaData=info;
if (LOG.isDebugEnabled())
LOG.debug("Commit {} to {}",info,this);
}