[FIXES JENKINS-14321] - Do not re-use last build's environment for re…

…mote polling Fixes, the original 'fix' in 3d9a73d it appears that a crucial check on the newly implemented argument wasn't actually implemented. I've changed the condition to test this rather than set 'b' to null if reuseLastBuildEnv is set to true as 'b' is de-referenced later in the getPollEnvironment method. Rather worryingly it appears that the existing code in getPollEnvironment tests at one point whether 'b' is null, but then later (outside this test) derefences it anyway, but this commit does not make that particular problem any worse. Signed-off-by: ciaranj <ciaranj@gmail.com>
jenkinsci · Jan 4, 2013 · df304f7 · df304f7
1 parent 4817492
commit df304f7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/hudson/plugins/git/util/GitUtils.java b/src/main/java/hudson/plugins/git/util/GitUtils.java
@@ -187,7 +187,7 @@ public static EnvVars getPollEnvironment(AbstractProject p, FilePath ws, Launche
         StreamBuildListener buildListener = new StreamBuildListener((OutputStream)listener.getLogger());
         AbstractBuild b = (AbstractBuild)p.getLastBuild();
 
-        if (b != null) {
+        if (reuseLastBuildEnv && b != null) {
             Node lastBuiltOn = b.getBuiltOn();
 
             if (lastBuiltOn != null) {