[JENKINS-42511] Make sure we do not attempt to create the same branch…

… project twice.
jenkinsci · Mar 7, 2017 · 61a48b1 · 61a48b1
1 parent 7184165
commit 61a48b1
Showing 1 changed file with 4 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 " + this);
+                }
                 project = _factory.newInstance(branch);
             }
             if (!project.getName().equals(encodedName)) {