[HUDSON-5925] Moved nulling out of buildEnvironments to cleanUp, so that node...

[HUDSON-5925] Moved nulling out of buildEnvironments to cleanUp, so that node variables are available to Publishers.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@34814 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/java/hudson/model/Build.java

@@ -146,7 +146,6 @@ public abstract class Build <P extends Project<P,B>,B extends Build<P,B>>
                         failed=true;
                     }                    
                 }
-                buildEnvironments = null;
                 // WARNING The return in the finally clause will trump any return before
                 if (failed) return FAILURE;
             }
@@ -167,6 +166,7 @@ public abstract class Build <P extends Project<P,B>,B extends Build<P,B>>
             performAllBuildSteps(listener, project.getPublishers(), false);
             performAllBuildSteps(listener, project.getProperties(), false);
             BuildTrigger.execute(Build.this, listener);
+            buildEnvironments = null;
         }
 
         private boolean build(BuildListener listener, Collection<Builder> steps) throws IOException, InterruptedException {

maven-plugin/src/main/java/hudson/maven/MavenBuild.java

@@ -555,7 +555,6 @@ public class MavenBuild extends AbstractMavenBuild<MavenModule,MavenBuild> {
                         failed=true;
                     }                    
                 }
-                buildEnvironments = null;
                 // WARNING The return in the finally clause will trump any return before
                 if (failed) return Result.FAILURE;
             }
@@ -569,6 +568,7 @@ public class MavenBuild extends AbstractMavenBuild<MavenModule,MavenBuild> {
         @Override
         public void cleanUp(BuildListener listener) throws Exception {
             scheduleDownstreamBuilds(listener);
+            buildEnvironments = null;
         }
     }
 

maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java

@@ -479,7 +479,6 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
                                 failed=true;
                             }                    
                         }
-                        buildEnvironments = null;
                         // WARNING The return in the finally clause will trump any return before
                         if (failed) return Result.FAILURE;
                     }
@@ -612,6 +611,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
             // too late to set the build result at this point. so ignore failures.
             performAllBuildSteps(listener, project.getPublishers(), false);
             performAllBuildSteps(listener, project.getProperties(), false);
+            buildEnvironments = null;
         }
 
     }