From 415c809fa82790552b5b2244f482c919e9da0bb0 Mon Sep 17 00:00:00 2001 From: abayer Date: Tue, 26 May 2009 19:37:03 +0000 Subject: [PATCH] [FIXED HUDSON-3767] doRun in RunnerImpl in both MavenBuild and MavenModuleSetBuild now use return from tearDown to set result, like hudson.model.Build does. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@18439 71c3de6d-444a-0410-be80-ed276b4c234a --- .../src/main/java/hudson/maven/MavenBuild.java | 13 ++++++++++--- .../main/java/hudson/maven/MavenModuleSetBuild.java | 13 +++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java index a0c9ede834..28ec35e3a2 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java @@ -501,10 +501,17 @@ public class MavenBuild extends AbstractBuild { } finally { if(normalExit) process.recycle(); else process.discard(); - for (int i = buildEnvironments.size() - 1; i >= 0; i--) { - buildEnvironments.get(i).tearDown(MavenBuild.this, listener); - buildEnvironments = null; + + // tear down in reverse order + boolean failed=false; + for( int i=buildEnvironments.size()-1; i>=0; i-- ) { + if (!buildEnvironments.get(i).tearDown(MavenBuild.this,listener)) { + failed=true; + } } + buildEnvironments = null; + // WARNING The return in the finally clause will trump any return before + if (failed) return Result.FAILURE; } } diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 6b476a7403..9a7939a338 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -379,10 +379,15 @@ public final class MavenModuleSetBuild extends AbstractBuild=0; i-- ) - buildEnvironments.get(i) - .tearDown(MavenModuleSetBuild.this, listener); - buildEnvironments = null; + boolean failed=false; + for( int i=buildEnvironments.size()-1; i>=0; i-- ) { + if (!buildEnvironments.get(i).tearDown(MavenModuleSetBuild.this,listener)) { + failed=true; + } + } + buildEnvironments = null; + // WARNING The return in the finally clause will trump any return before + if (failed) return Result.FAILURE; } }