[FIXED JENKINS-12226] Triggering a build with 'Current build paramete…

…rs' fails when the current build parameters includes a node name
jenkinsci · Feb 25, 2012 · af9c222 · af9c222
1 parent 5f181a3
commit af9c222
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/main/java/org/jvnet/jenkins/plugins/nodelabelparameter/NodeParameterValue.java b/src/main/java/org/jvnet/jenkins/plugins/nodelabelparameter/NodeParameterValue.java
@@ -79,17 +79,19 @@ public BuildWrapper createBuildWrapper(AbstractBuild<?, ?> build) {
 		build.addAction(new LabelBadgeAction(getLabel(), Messages.LabelBadgeAction_node_tooltip(getLabel())));
 
 		final ParametersDefinitionProperty property = build.getProject().getProperty(hudson.model.ParametersDefinitionProperty.class);
-		final List<ParameterDefinition> parameterDefinitions = property.getParameterDefinitions();
-		for (ParameterDefinition paramDef : parameterDefinitions) {
-			if (paramDef instanceof NodeParameterDefinition) {
-				final NodeParameterDefinition nodeParameterDefinition = (NodeParameterDefinition) paramDef;
-				if (nodeParameterDefinition.getAllowMultiNodeSelection()) {
-					// we expect only one node parameter definition per job
-					return new TriggerNextBuildWrapper(nodeParameterDefinition);
-				} else {
-					return null;
-				}
-			}
+        if (property != null) {
+            final List<ParameterDefinition> parameterDefinitions = property.getParameterDefinitions();
+            for (ParameterDefinition paramDef : parameterDefinitions) {
+                if (paramDef instanceof NodeParameterDefinition) {
+                    final NodeParameterDefinition nodeParameterDefinition = (NodeParameterDefinition) paramDef;
+                    if (nodeParameterDefinition.getAllowMultiNodeSelection()) {
+                        // we expect only one node parameter definition per job
+                        return new TriggerNextBuildWrapper(nodeParameterDefinition);
+                    } else {
+                        return null;
+                    }
+                }
+            }
 		}
 		return null;
 	}