Merge pull request #92 from jglick/ISE-JENKINS-42511

[JENKINS-42511] Make sure we do not attempt to create the same branch project twice
jenkinsci · Mar 8, 2017 · 509a08c · 509a08c
2 parents 5f30c4e + c79800d
commit 509a08c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/jenkins/branch/MultiBranchProject.java b/src/main/java/jenkins/branch/MultiBranchProject.java
@@ -2043,8 +2043,11 @@ public void observe(@NonNull SCMHead head, @NonNull SCMRevision revision) {
                 return;
             }
             try (ChildNameGenerator.Trace trace = ChildNameGenerator.beforeCreateItem(
-                    MultiBranchProject.this, branch.getEncodedName(), branch.getName()
+                    MultiBranchProject.this, encodedName, branch.getName()
             )){
+                if (getItem(encodedName) != null) {
+                    throw new IllegalStateException("JENKINS-42511: attempted to redundantly create " + encodedName + " in " + MultiBranchProject.this);
+                }
                 project = _factory.newInstance(branch);
             }
             if (!project.getName().equals(encodedName)) {

diff --git a/src/main/java/jenkins/branch/OrganizationFolder.java b/src/main/java/jenkins/branch/OrganizationFolder.java
@@ -1314,6 +1314,9 @@ public void complete() throws IllegalStateException, IOException, InterruptedExc
                         try (ChildNameGenerator.Trace trace = ChildNameGenerator.beforeCreateItem(
                                 OrganizationFolder.this, folderName, projectName
                         )) {
+                            if (getItem(folderName) != null) {
+                                throw new IllegalStateException("JENKINS-42511: attempted to redundantly create " + folderName + " in " + OrganizationFolder.this);
+                            }
                             project = factory.createNewProject(
                                     OrganizationFolder.this, folderName, sources, attributes, listener
                             );