Skip to content

fix JENKINS-46940 by preventing entries having the same project name from being added more than once #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix JENKINS-46940 by preventing entries having the same project name from being added more than once #123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/PipelineBuild.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.HashSet;
import java.util.logging.Logger;

import au.com.centrumsystems.hudson.plugin.util.BuildUtil;
Expand Down Expand Up @@ -170,6 +172,8 @@ public List<PipelineBuild> getDownstreamPipeline() {
final AbstractProject<?, ?> currentProject;
currentProject = getProject();

Set seen = new HashSet<String>();

final List<AbstractProject<?, ?>> downstreamProjects = ProjectUtil.getDownstreamProjects(currentProject);
for (final AbstractProject<?, ?> proj : downstreamProjects) {
AbstractBuild<?, ?> returnedBuild = null;
Expand All @@ -178,6 +182,7 @@ public List<PipelineBuild> getDownstreamPipeline() {
}
final PipelineBuild newPB = new PipelineBuild(returnedBuild, proj, this.currentBuild);
pbList.add(newPB);
seen.add(newPB.getProject().getName());
}
if (Hudson.getInstance().getPlugin("parameterized-trigger") != null) {
for (SubProjectsAction action : Util.filter(currentProject.getActions(), SubProjectsAction.class)) {
Expand All @@ -188,6 +193,9 @@ public List<PipelineBuild> getDownstreamPipeline() {
returnedBuild = BuildUtil.getDownstreamBuild(dependency, currentBuild);
}
final PipelineBuild candidate = new PipelineBuild(returnedBuild, dependency, this.currentBuild);
final String candidateProjectName = candidate.getProject().getName();
if (seen.contains(candidateProjectName)) continue;
seen.add(candidateProjectName);
// if subprojects come back as downstreams someday, no duplicates wanted
if (!pbList.contains(candidate)) {
pbList.add(candidate);
Expand Down