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

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

This commit is contained in:
Greg Wilkins 2013-07-04 15:52:39 +10:00
parent 37de67d3d7 cb0084260f
commit 606c042691
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
View File

@ -32,6 +32,7 @@ import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.RequestLog; import org.eclipse.jetty.server.RequestLog;
import org.eclipse.jetty.server.Response; import org.eclipse.jetty.server.Response;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
@ -154,7 +155,10 @@ public class RequestLogHandler extends HandlerWrapper
protected void doStart() throws Exception protected void doStart() throws Exception
{ {
if (_requestLog==null) if (_requestLog==null)
throw new IllegalStateException("!RequestLog"); {
LOG.warn("!RequestLog");
_requestLog=new NullRequestLog();
}
super.doStart(); super.doStart();
_requestLog.start(); _requestLog.start();
} }
@ -168,6 +172,18 @@ public class RequestLogHandler extends HandlerWrapper
{ {
super.doStop(); super.doStop();
_requestLog.stop(); _requestLog.stop();
if (_requestLog instanceof NullRequestLog)
_requestLog=null;
}
/* ------------------------------------------------------------ */
/* ------------------------------------------------------------ */
/* ------------------------------------------------------------ */
private static class NullRequestLog extends AbstractLifeCycle implements RequestLog
{
public void log(Request request, Response response)
{
}
} }
} }