diff --git a/core/src/main/java/hudson/logging/LogRecorder.java b/core/src/main/java/hudson/logging/LogRecorder.java index 2299a74027b72e8d7ca28c79d1eef10e310b8cd9..d3660efaeaf44d3e0a9f0210fad73267cf2e1b49 100644 --- a/core/src/main/java/hudson/logging/LogRecorder.java +++ b/core/src/main/java/hudson/logging/LogRecorder.java @@ -31,6 +31,7 @@ import hudson.Util; import hudson.XmlFile; import hudson.model.AbstractModelObject; import hudson.model.Computer; +import hudson.util.HttpResponses; import jenkins.model.Jenkins; import hudson.model.Saveable; import hudson.model.TaskListener; @@ -44,6 +45,7 @@ import hudson.util.RingBufferLogHandler; import hudson.util.XStream2; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.interceptor.RequirePOST; @@ -298,9 +300,9 @@ public class LogRecorder extends AbstractModelObject implements Saveable { } @RequirePOST - public void doClear(StaplerRequest req, StaplerResponse rsp) throws IOException { + public HttpResponse doClear() throws IOException { handler.clear(); - rsp.sendRedirect2("."); + return HttpResponses.redirectToDot(); } /** diff --git a/core/src/test/java/hudson/logging/LogRecorderTest.java b/core/src/test/java/hudson/logging/LogRecorderTest.java index 2c136ae575a236ae6ad9f84083b117eeb50395c5..4bf87146b1dbc2e9b3a25ceb618b9c267e6924ef 100644 --- a/core/src/test/java/hudson/logging/LogRecorderTest.java +++ b/core/src/test/java/hudson/logging/LogRecorderTest.java @@ -24,6 +24,7 @@ package hudson.logging; +import java.io.IOException; import java.util.logging.Level; import java.util.logging.LogRecord; import org.junit.Test; @@ -54,7 +55,7 @@ public class LogRecorderTest { assertFalse(matches("", "hudson.model.Hudson", Level.FINE)); } - @Test public void testClearing() { + @Test public void testClearing() throws IOException { LogRecorder lr = new LogRecorder("foo"); LogRecorder.Target t = new LogRecorder.Target("", Level.FINE); lr.targets.add(t); @@ -62,11 +63,11 @@ public class LogRecorderTest { LogRecord record = createLogRecord("jenkins", Level.INFO, "message"); lr.handler.publish(record); assertEquals(lr.handler.getView().get(0), record); - assertTrue(lr.handler.getView().size() == 1); + assertEquals(1, lr.handler.getView().size()); - lr.handler.clear(); + lr.doClear(); - assertTrue(lr.handler.getView().size() == 0); + assertEquals(0, lr.handler.getView().size()); } @Test public void testSpecificExclusion() {