Skip to content
Permalink
Browse files

Merge pull request #7 from alvarolobato/JENKINS-38709

JENKINS-38709 - Merge previous console log filter instead of overriding it.
  • Loading branch information
alvarolobato committed Oct 27, 2016
2 parents c2d1365 + af60206 commit 1d71349cffe4fbb4d3776c11ad2eea4584150f08
@@ -51,6 +51,7 @@
import org.jenkinsci.plugins.workflow.steps.AbstractStepExecutionImpl;
import org.jenkinsci.plugins.workflow.steps.BodyExecution;
import org.jenkinsci.plugins.workflow.steps.BodyExecutionCallback;
import org.jenkinsci.plugins.workflow.steps.BodyInvoker;
import org.jenkinsci.plugins.workflow.steps.EnvironmentExpander;
import org.jenkinsci.plugins.workflow.steps.StepContext;
import org.jenkinsci.plugins.workflow.steps.StepContextParameter;
@@ -133,7 +134,7 @@ public boolean start() throws Exception {
setupJDK();
setupMaven();

MavenConsoleFilter consFilter = new MavenConsoleFilter(getComputer().getDefaultCharset().name());
ConsoleLogFilter consFilter = BodyInvoker.mergeConsoleLogFilters(getContext().get(ConsoleLogFilter.class), new MavenConsoleFilter(getComputer().getDefaultCharset().name()));
EnvironmentExpander envEx = EnvironmentExpander.merge(getContext().get(EnvironmentExpander.class), new ExpanderImpl(envOverride));

body = getContext().newBodyInvoker().withContexts(envEx, consFilter).withCallback(new Callback(tempBinDir)).start();

0 comments on commit 1d71349

Please sign in to comment.
You can’t perform that action at this time.