Use relativePath for artifact names if they're not set due to exceedi…

…ng LIST_CUTOFF [JENKINS-33351]
jenkinsci · Apr 22, 2016 · abf6e1d · abf6e1d
1 parent e66ebf4
commit abf6e1d
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/rest-api/src/main/java/com/cloudbees/workflow/rest/external/BuildArtifactExt.java b/rest-api/src/main/java/com/cloudbees/workflow/rest/external/BuildArtifactExt.java
@@ -85,6 +85,13 @@ public static BuildArtifactExt create(Run<WorkflowJob, WorkflowRun>.Artifact art
 
         inputActionExt.setId(artifact.getTreeNodeId());
         inputActionExt.setName(artifact.getDisplayPath());
+
+        // DisplayPath does some custom processing to handle collisions, but isn't set if we have more than
+        // Run.LIST_CUTOFF artifacts - since we're just using this for display, relativePath is good enough
+        String nameCandidate = artifact.getDisplayPath();
+        inputActionExt.setName(
+                (nameCandidate != null) ? nameCandidate : artifact.relativePath
+        );
         inputActionExt.setPath(artifact.getHref());
         inputActionExt.setUrl(RunAPI.getArtifactUrl(run, artifact));
         inputActionExt.setSize(artifact.getFileSize());