Skip to content
Permalink
Browse files
[JENKINS-26739] Merging #1592.
  • Loading branch information
jglick committed Mar 3, 2015
2 parents 87ab95e + 5ada903 commit cf2b02dc58c140aafc4e20115a8bc936d05815be
Showing with 6 additions and 1 deletion.
  1. +3 −0 changelog.html
  2. +3 −1 core/src/main/java/hudson/model/RunMap.java
@@ -58,6 +58,9 @@
<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>)
</ul>
</div><!--=TRUNK-END=-->

@@ -186,7 +186,9 @@ public R put(R 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);
}

0 comments on commit cf2b02d

Please sign in to comment.