From e998c2a670fbb7f9e32af37218e7076de696455e Mon Sep 17 00:00:00 2001
From: Stephen Connolly <stephen.alan.connolly@gmail.com>
Date: Thu, 9 Jan 2014 12:46:42 +0000
Subject: [PATCH] [FIX JENKINS-21303] There is a NPE here that can and does
 happen for real when an aggresive slave retention strategy interacts with
 post build triggers that want to do token macro expansion

---
 core/src/main/java/hudson/model/Job.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 2e3ed8a7a8..2746c74d08 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -358,10 +358,12 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
     public EnvVars getEnvironment(Node node, TaskListener listener) throws IOException, InterruptedException {
         EnvVars env;
 
-        if (node!=null)
-            env = node.toComputer().buildEnvironment(listener);
-        else
+        if (node!=null) {
+            final Computer computer = node.toComputer();
+            env = (computer != null) ? computer.buildEnvironment(listener) : new EnvVars();                
+        } else {
             env = new EnvVars();
+        }
 
         env.putAll(getCharacteristicEnvVars());
 
-- 
GitLab