[FIXED JENKINS-14266] check unset variable

if env.expand don't expand a variable, this means this one has not been set, then should not break trying to parse, just ignore and let the "optional" plugin parameter fail the build if necessary
jenkinsci · Apr 17, 2013 · fe01ca9 · fe01ca9 · jglick · Apr 26, 2013
1 parent 4203fe7
commit fe01ca9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/copyartifact/.SpecificBuildSelector.java.swp b/src/main/java/hudson/plugins/copyartifact/.SpecificBuildSelector.java.swp
diff --git a/src/main/java/hudson/plugins/copyartifact/SpecificBuildSelector.java b/src/main/java/hudson/plugins/copyartifact/SpecificBuildSelector.java
@@ -48,7 +48,9 @@ public String getBuildNumber() {
 
     @Override
     public Run<?,?> getBuild(Job<?,?> job, EnvVars env, BuildFilter filter, Run<?,?> parent) {
-        Run<?,?> run = job.getBuildByNumber(Integer.parseInt(env.expand(buildNumber)));
+        String buildNumber = env.expand(buildNumber);
+        if (buildNumber.startsWith("$")) return null; // unresolved variable, probably unset
+        Run<?,?> run = job.getBuildByNumber(Integer.parseInt(buildNumber));
         return (run != null && filter.isSelectable(run, env)) ? run : null;
     }