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

17
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,14 +385,6 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
}
}
}
finally
{
setCurrentHttpChannel(last);
if (threadName != null && LOG.isDebugEnabled())
Thread.currentThread().setName(threadName);
}
if (action==Action.COMPLETE)
{
try
@ -425,6 +415,13 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
onCompleted();
}
}
}
finally
{
setCurrentHttpChannel(last);
if (threadName != null && LOG.isDebugEnabled())
Thread.currentThread().setName(threadName);
}
if (LOG.isDebugEnabled())
LOG.debug("{} handle exit, result {}", this, action);