[FIXED JENKINS-14816] 404 navigating to upstream builds.

jenkinsci · Aug 15, 2012 · aaecf79 · aaecf79
1 parent 43f1f5d
commit aaecf79
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/changelog.html b/changelog.html
@@ -55,6 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Avoid a 404 when navigating to upstream builds.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-14816">issue 14816</a>)
   <li class=bug>
     Avoid a 404 when canceling queue items.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-14813">issue 14813</a>)

diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description.jelly b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description.jelly
@@ -23,6 +23,10 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-    <!-- upstreamUrl added in 1.284, so handle missing value -->
-    <span><j:out value='${it.upstreamUrl!=null ? "%started_by_project(it.upstreamProject,it.upstreamBuild.toString(),it.upstreamUrl,rootURL)" : it.shortDescription}' /></span>
+    <!-- upstreamUrl added in 1.284, so handle missing value; also JENKINS-14816 (job/build may have been deleted) -->
+    <span><j:out value='${it.upstreamUrl!=null and
+                            app.getItemByFullName(it.upstreamProject)!=null and
+                            app.getItemByFullName(it.upstreamProject).getBuildByNumber(it.upstreamBuild)!=null ?
+                          "%started_by_project(it.upstreamProject,it.upstreamBuild.toString(),it.upstreamUrl,rootURL)" :
+                          it.shortDescription}'/></span>
 </j:jelly>