Merge pull request #39 from slide/master

Fix JENKINS-19222
jenkinsci · Feb 4, 2015 · 4260b55 · 4260b55
2 parents de93818 + 6338990
commit 4260b55
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectVariableGetter.java b/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectVariableGetter.java
@@ -4,6 +4,7 @@
 import hudson.Util;
 import hudson.matrix.MatrixRun;
 import hudson.model.*;
+import hudson.model.Hudson.MasterComputer;
 import hudson.util.LogTaskListener;
 import org.jenkinsci.lib.envinject.EnvInjectException;
 import org.jenkinsci.lib.envinject.EnvInjectLogger;
@@ -40,9 +41,14 @@ public Map<String, String> getJenkinsSystemVariables(boolean forceOnMaster) thro
         //test if there is at least one executor
         if (computer != null) {
             result = computer.getEnvironment().overrideAll(result);
+            if(computer instanceof MasterComputer) {
+                result.put("NODE_NAME", "master");
+            } else {
+                result.put("NODE_NAME", computer.getName());
+            }
+
             Node n = computer.getNode();
             if (n != null) {
-                result.put("NODE_NAME", computer.getName());
                 result.put("NODE_LABELS", Util.join(n.getAssignedLabels(), " "));
             }
         }