Merge remote-tracking branch 'origin/jetty-7' into jetty-8

This commit is contained in:
Jan Bartel 2013-08-05 12:35:16 +10:00
commit 446820071b
1 changed files with 19 additions and 16 deletions

View File

@ -69,25 +69,28 @@ public class RequestLogHandler extends HandlerWrapper
}
finally
{
if (continuation.isAsync())
if (_requestLog != null && baseRequest.getDispatcherType().equals(DispatcherType.REQUEST))
{
if (continuation.isInitial())
continuation.addContinuationListener(new ContinuationListener()
{
public void onTimeout(Continuation continuation)
if (continuation.isAsync())
{
if (continuation.isInitial())
continuation.addContinuationListener(new ContinuationListener()
{
}
public void onTimeout(Continuation continuation)
{
public void onComplete(Continuation continuation)
{
_requestLog.log(baseRequest, (Response)response);
}
});
}
public void onComplete(Continuation continuation)
{
_requestLog.log(baseRequest, (Response)response);
}
});
}
else
_requestLog.log(baseRequest, (Response)response);
}
else
_requestLog.log(baseRequest, (Response)response);
}
}