JENKINS-44989 - addIssuesFromDependentBuilds method shouldn't call ad…

…dIssuesRecursive
jenkinsci · Mar 12, 2018 · c1d681b · c1d681b
1 parent 6a1f829
commit c1d681b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/jira/selector/DefaultIssueSelector.java b/src/main/java/hudson/plugins/jira/selector/DefaultIssueSelector.java
@@ -128,11 +128,16 @@ protected void addIssuesFromCurrentBuild(Run<?, ?> build, JiraSite site, TaskLis
      * {@link #addIssuesRecursive(Run, JiraSite, TaskListener, Set) is called.
      */
     protected void addIssuesFromDependentBuilds(Run<?, ?> build, JiraSite site, TaskListener listener,
-            Set<String> issueIds) {
+            Set<String> issueIds) {		
+        Pattern pattern = site.getIssuePattern();
+
         for (DependencyChange depc : RunScmChangeExtractor.getDependencyChanges(build).values()) {
             for (AbstractBuild<?, ?> b : depc.getBuilds()) {
                 getLogger().finer("Searching for JIRA issues in dependency " + b + " of " + build);
-                addIssuesRecursive(b, site, listener, issueIds);
+
+                // Fix JENKINS-44989
+                // The original code before refactoring just called "findIssues", not "findIssueIdsRecursive"
+                findIssues(b, issueIds, pattern, listener);
             }
         }
     }