From 320eea930e27330a38f32b4feb3a9cc2287054e5 Mon Sep 17 00:00:00 2001 From: imod Date: Sat, 16 Mar 2013 10:53:45 +0100 Subject: [PATCH] [FIXED JENKINS-17177] wrong build result in post build steps after failed pre build step in maven project --- changelog.html | 3 ++ .../hudson/maven/MavenModuleSetBuild.java | 10 ++-- .../java/hudson/maven/MavenProjectTest.java | 17 ++++++ .../hudson/maven/ResultExposingBuilder.java | 52 +++++++++++++++++++ 4 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 test/src/test/java/hudson/maven/ResultExposingBuilder.java diff --git a/changelog.html b/changelog.html index 893865abc1..5d3649b67f 100644 --- a/changelog.html +++ b/changelog.html @@ -74,6 +74,9 @@ Upcoming changes
  • Remember the lastStable/Failed/Successful/etc builds to avoid eager loading builds. (issue 16089) +
  • + Wrong build result in post build steps after failed pre build step in maven projects. + (issue 17177) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 6d5b93ee26..c5874d3d61 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -598,8 +598,10 @@ public class MavenModuleSetBuild extends AbstractMavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { + result = build.getResult(); + return super.perform(build, launcher, listener); + } + + public Result getResult() { + return result; + } +} \ No newline at end of file