Merge pull request #271 from abayer/jenkins-29326

[JENKINS-29326] Don't add duplicate BuildData (downstream) Originally-Committed-As: 3840d8ca847ed0ea8097c2f62e7b21504190afad
jenkinsci · Dec 16, 2015 · ec2575b · ec2575b
2 parents 6d292e4 + 82b41a7
commit ec2575b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/job/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java b/job/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java
@@ -71,6 +71,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -444,11 +445,11 @@ public void addTrigger(Trigger trigger) {
         if (b == null) {
             return Collections.emptySet();
         }
-        List<SCM> scms = new LinkedList<SCM>();
+        Map<String,SCM> scms = new LinkedHashMap<String,SCM>();
         for (WorkflowRun.SCMCheckout co : b.checkouts(null)) {
-            scms.add(co.scm);
+            scms.put(co.scm.getKey(), co.scm);
         }
-        return scms;
+        return scms.values();
     }
 
     public @CheckForNull SCM getTypicalSCM() {