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

[FIXED JENKINS-8968] When both "block build when upstream/downstream is building" are checked,the upstream block check wasn't taking effect.

changelog.html

@@ -60,6 +60,9 @@ Upcoming changes</a>
 <!-- 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>

core/src/main/java/hudson/model/AbstractProject.java

@@ -1057,7 +1057,8 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
             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);