[JENKINS-49433] - Prevent NPEs in JobDSL ConditionContext operations.

Fixes the following operations: `selfPromotion()`, `parameterizedSelfPromotion()`, `downstream()`
jenkinsci · Feb 12, 2018 · f0363e9 · f0363e9
1 parent 3849c36
commit f0363e9
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/main/java/hudson/plugins/promoted_builds/integrations/jobdsl/ConditionsContext.java b/src/main/java/hudson/plugins/promoted_builds/integrations/jobdsl/ConditionsContext.java
@@ -11,6 +11,8 @@
 
 import javaposse.jobdsl.plugin.DslEnvironment;
 
+import javax.annotation.CheckForNull;
+
 import static javaposse.jobdsl.plugin.ContextExtensionPoint.executeInContext;
 
 public class ConditionsContext implements Context {
@@ -56,17 +58,17 @@ public ConditionsContext(DslEnvironment dslEnvironment) {
 		this.dslEnvironment = dslEnvironment;
 	}
 
-	public void selfPromotion(Boolean evenIfUnstable) {
+	public void selfPromotion(@CheckForNull Boolean evenIfUnstable) {
 		isSelfPromotion = true;
-		if (evenIfUnstable) {
-			this.evenIfUnstable = evenIfUnstable;
+		if (evenIfUnstable != null && evenIfUnstable) {
+			this.evenIfUnstable = true;
 		}
 	}
 
-	public void parameterizedSelfPromotion(Boolean evenIfUnstable, String parameterName, String parameterValue) {
+	public void parameterizedSelfPromotion(@CheckForNull Boolean evenIfUnstable, String parameterName, String parameterValue) {
 		isParameterizedSelfPromotion = true;
-		if (evenIfUnstable) {
-			this.isParameterizedSelfPromotion = evenIfUnstable;
+		if (evenIfUnstable != null && evenIfUnstable) {
+			this.isParameterizedSelfPromotion = true;
 		}
 		this.parameterName = parameterName;
 		this.parameterValue = parameterValue;
@@ -94,10 +96,10 @@ public void parameters(Closure<?> parametersClosure) {
 		params.putAll(parametersContext.getBuildParameterNodes());
 	}
 
-	public void downstream(Boolean evenIfUnstable, String jobs) {
+	public void downstream(@CheckForNull Boolean evenIfUnstable, String jobs) {
 		isDownstreamPass = true;
-		if (evenIfUnstable) {
-			this.evenIfUnstableDownstream = evenIfUnstable;
+		if (evenIfUnstable != null && evenIfUnstable) {
+			this.evenIfUnstableDownstream = true;
 		}
 		this.jobs = jobs;
 	}