From dedee1978345fa23e7d3773f64572c4a6f027882 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 26 Jul 2013 16:17:42 -0400 Subject: [PATCH] [FIXED JENKINS-16316] Do not inject master node property variables into EnvVars.masterEnvVars on slaves. --- .../plugins/envinject/EnvInjectComputerListener.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectComputerListener.java b/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectComputerListener.java index d2d82847..22ee643b 100644 --- a/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectComputerListener.java +++ b/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectComputerListener.java @@ -77,13 +77,6 @@ private EnvVars getNewSlaveEnvironmentVariables(Computer c, FilePath nodePath, T Map currentEnvVars = new HashMap(); - // -- Retrieve Environment variables from master - for (NodeProperty nodeProperty : Hudson.getInstance().getGlobalNodeProperties()) { - if (nodeProperty instanceof EnvironmentVariablesNodeProperty) { - currentEnvVars.putAll(((EnvironmentVariablesNodeProperty) nodeProperty).getEnvVars()); - } - } - EnvInjectLogger logger = new EnvInjectLogger(listener); EnvInjectEnvVars envInjectEnvVarsService = new EnvInjectEnvVars(logger);