Skip to content
Permalink
Browse files

[FIXED JENKINS-8968] When both "block build when upstream/downstream …

…is building" are checked,the upstream block check wasn't taking effect.
  • Loading branch information
kohsuke committed Mar 15, 2011
1 parent b497728 commit 3f9e65d825770e47bbfd76c77c17a0c4dae6844e
Showing with 5 additions and 1 deletion.
  1. +3 −0 changelog.html
  2. +2 −1 core/src/main/java/hudson/model/AbstractProject.java
@@ -60,6 +60,9 @@
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=bug>
When both "block build when upstream/downstream is building" are checked, the upstream block check wasn't taking effect.
(<a href="http://issues.jenkins-ci.org/browse/JENKINS-8968">issue 8968</a>)
<li class=rfe>
Added the <tt>--mimeTypes</tt> command line option to define additional MIME type mappings.
<li class=rfe>
@@ -1057,7 +1057,8 @@ public CauseOfBlockage getCauseOfBlockage() {
AbstractProject<?,?> bup = getBuildingDownstream();
if (bup!=null)
return new BecauseOfDownstreamBuildInProgress(bup);
} else if (blockBuildWhenUpstreamBuilding()) {
}
if (blockBuildWhenUpstreamBuilding()) {
AbstractProject<?,?> bup = getBuildingUpstream();
if (bup!=null)
return new BecauseOfUpstreamBuildInProgress(bup);

0 comments on commit 3f9e65d

Please sign in to comment.
You can’t perform that action at this time.