[FIXED JENKINS-9359] defend against NPE in EnvAction

jenkinsci · Apr 15, 2011 · 8a1e337 · 8a1e337
1 parent 40fcf75
commit 8a1e337
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/copyartifact/CopyArtifact.java b/src/main/java/hudson/plugins/copyartifact/CopyArtifact.java
@@ -348,6 +348,7 @@ private static class EnvAction implements EnvironmentContributingAction {
         private transient Map<String,String> data = new HashMap<String,String>();
 
         private void add(String projectName, int buildNumber) {
+            if (data==null) return;
             int i = projectName.indexOf('/'); // Omit any detail after a /
             if (i > 0) projectName = projectName.substring(0, i);
             data.put("COPYARTIFACT_BUILD_NUMBER_"
@@ -356,7 +357,7 @@ private void add(String projectName, int buildNumber) {
         }
 
         public void buildEnvVars(AbstractBuild<?,?> build, EnvVars env) {
-            env.putAll(data);
+            if (data!=null) env.putAll(data);
         }
 
         public String getIconFileName() { return null; }