From 6ee6fc3b2f7a9bceca1b04c4af5e6f1b024e2ab4 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 2 Mar 2015 20:16:35 -0500
Subject: [PATCH] [JENKINS-26739] Backporting #1592 to rc.

(cherry picked from commit cf2b02dc58c140aafc4e20115a8bc936d05815be)

Conflicts:
	changelog.html
---
 changelog.html                              | 3 +++
 core/src/main/java/hudson/model/RunMap.java | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changelog.html b/changelog.html
index bd1968d321..675a603ea9 100644
--- a/changelog.html
+++ b/changelog.html
@@ -66,6 +66,9 @@ Upcoming changes</a>
   <li class="major bug">
     Regression with environment variables in 1.600.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-27188">issue 27188</a>)
+  <li class="major bug">
+    Errors with concurrent matrix builds since 1.597.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-26739">issue 26739</a>)
   <li class=bug>
     Errors in Dashboard View plugin since 1.597.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-26690">issue 26690</a>)
diff --git a/core/src/main/java/hudson/model/RunMap.java b/core/src/main/java/hudson/model/RunMap.java
index f5897bb5e8..ad2ae988c6 100644
--- a/core/src/main/java/hudson/model/RunMap.java
+++ b/core/src/main/java/hudson/model/RunMap.java
@@ -186,7 +186,9 @@ public final class RunMap<R extends Run<?,R>> extends AbstractLazyLoadRunMap<R>
         if (rootDir.isDirectory()) {
             throw new IllegalStateException(rootDir + " already existed; will not overwite with " + r);
         }
-        proposeNewNumber(r.getNumber());
+        if (!r.getClass().getName().equals("hudson.matrix.MatrixRun")) { // JENKINS-26739: grandfathered in
+            proposeNewNumber(r.getNumber());
+        }
         rootDir.mkdirs();
         return super._put(r);
     }
-- 
GitLab