From af9c2220c3b089cdd3f5631446b2c7e136419f21 Mon Sep 17 00:00:00 2001 From: imod Date: Sat, 25 Feb 2012 11:04:22 +0100 Subject: [PATCH] [FIXED JENKINS-12226] Triggering a build with 'Current build parameters' fails when the current build parameters includes a node name --- .../NodeParameterValue.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 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 index a957808..e992a98 100644 --- 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 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 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; }