[FIXED JENKINS-26374] - Avoid NPE for deleted builds in UpstreamCause…

…Restriction for jobs Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>
jenkinsci · Jan 9, 2015 · b5c25e3 · b5c25e3
1 parent 47b292f
commit b5c25e3
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 4 deletions.
diff --git a/...ava/com/synopsys/arc/jenkinsci/plugins/jobrestrictions/jobs/UpstreamCauseRestriction.java b/...ava/com/synopsys/arc/jenkinsci/plugins/jobrestrictions/jobs/UpstreamCauseRestriction.java
@@ -29,6 +29,7 @@
 import hudson.Extension;
 import hudson.model.Cause;
 import hudson.model.Descriptor;
+import hudson.model.Run;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
@@ -38,19 +39,38 @@
 public class UpstreamCauseRestriction extends JobCauseRestriction<Cause.UpstreamCause> {
 
     JobRestriction jobRestriction;
+    final boolean skipCheckForMissingInfo;
 
     @DataBoundConstructor
-    public UpstreamCauseRestriction(JobRestriction jobRestriction) {
+    public UpstreamCauseRestriction(JobRestriction jobRestriction, 
+            boolean skipCheckForMissingInfo) {
         this.jobRestriction = jobRestriction;
+        this.skipCheckForMissingInfo = skipCheckForMissingInfo;
+    }
+
+    public UpstreamCauseRestriction(JobRestriction jobRestriction) {
+        this(jobRestriction, false);
     }
 
     public JobRestriction getJobRestriction() {
         return jobRestriction;
     }
-
+
+    public boolean isSkipCheckForMissingInfo() {
+        return skipCheckForMissingInfo;
+    }
+
     @Override
     public void validate(Cause.UpstreamCause cause) throws AbortException {
-       if (jobRestriction != null && !jobRestriction.canTake(cause.getUpstreamRun())) {
+       final Run upstreamRun = cause.getUpstreamRun();
+       if (upstreamRun == null) {
+           if (!skipCheckForMissingInfo) {
+               throw new AbortException("Upstream build info is missing");
+           } else {
+               return;
+           }
+       } 
+       if (jobRestriction != null && !jobRestriction.canTake(upstreamRun)) {
            throw new AbortException("Job can't be executed due to upstream restrictions");
        } 
     }

diff --git a/...synopsys/arc/jenkinsci/plugins/jobrestrictions/jobs/UpstreamCauseRestriction/config.jelly b/...synopsys/arc/jenkinsci/plugins/jobrestrictions/jobs/UpstreamCauseRestriction/config.jelly
@@ -23,5 +23,10 @@
  -->
 <?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" xmlns:sl="/hudson/plugins/sidebar_link">
-    <f:dropdownDescriptorSelector title="${%Restriction}" field="jobRestriction" />
+    <f:entry field="skipCheckForMissingInfo" title="${%Skip missing builds}">
+        <f:checkbox title="${%skipCheckForMissingInfo}" checked="${it.skipCheckForMissingInfo}"/>
+    </f:entry>
+    <f:entry>
+        <f:dropdownDescriptorSelector title="${%Restriction}" field="jobRestriction" />
+    </f:entry>
 </j:jelly>
diff --git a/...sys/arc/jenkinsci/plugins/jobrestrictions/jobs/UpstreamCauseRestriction/config.properties b/...sys/arc/jenkinsci/plugins/jobrestrictions/jobs/UpstreamCauseRestriction/config.properties
@@ -0,0 +1 @@
+skipCheckForMissingInfo=Don't fail for jobs with missing upstream build info
diff --git a/...i/plugins/jobrestrictions/jobs/UpstreamCauseRestriction/help-skipCheckForMissingInfo.html b/...i/plugins/jobrestrictions/jobs/UpstreamCauseRestriction/help-skipCheckForMissingInfo.html
@@ -0,0 +1,12 @@
+<div>
+    Allows to disable the check for missing upstream build info.
+    <p>
+        Upstream build info may be missing in several cases 
+        (e.g. build has been deleted by log rotation handlers).
+        In such case the plugin won&#39;t be able to extract the data from the upstream build.
+    </p>
+    <p>
+        The enabled control will prevent false-failures, but the security may be violated.
+        Use the control <b style="color:red">on your own risk</b>
+    </p>
+</div>