Merge pull request #14 from arothian/master

[FIXED JENKINS-22447] Fix workspace lock release for ivy build
jenkinsci · Apr 25, 2014 · cff77d0 · cff77d0
2 parents 2a19326 + 25deb53
commit cff77d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/main/java/hudson/ivy/IvyBuild.java b/src/main/java/hudson/ivy/IvyBuild.java
@@ -468,6 +468,8 @@ public void post2(BuildListener listener) throws Exception {
 
         @Override
         public void cleanUp(BuildListener listener) throws Exception {
+            super.cleanUp(listener);
+
             // at this point it's too late to mark the build as a failure, so ignore return value.
             performAllBuildSteps(listener, reporters,false);
             performAllBuildSteps(listener, project.getProperties(),false);

diff --git a/src/main/java/hudson/ivy/IvyModuleSetBuild.java b/src/main/java/hudson/ivy/IvyModuleSetBuild.java
@@ -612,6 +612,8 @@ protected void post2(BuildListener listener) throws Exception {
 
         @Override
         public void cleanUp(BuildListener listener) throws Exception {
+            super.cleanUp(listener);
+
             if (project.isAggregatorStyleBuild()) {
                 // schedule downstream builds. for non aggregator style builds,
                 // this is done by each module