JENKINS-29539 NullPointerException on Matrix project

jenkinsci · Aug 11, 2015 · fbec4f6 · fbec4f6
1 parent 9a9145c
commit fbec4f6
Show file tree

Hide file tree

Showing 2 changed files with 8,177 additions and 18 deletions.
diff --git a/.../com/cwctravel/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterValue.java b/.../com/cwctravel/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterValue.java
@@ -36,29 +36,28 @@ public String resolve(String name) {
 				String result = null;
 				if(ExtendedChoiceParameterValue.this.getName().equals(name)) {
 					result = value;
-
-					ParametersDefinitionProperty parametersDefinitionProperty = build.getProject().getProperty(ParametersDefinitionProperty.class);
-					if(parametersDefinitionProperty != null) {
-						ParameterDefinition parameterDefinition = parametersDefinitionProperty.getParameterDefinition(name);
-						if(parameterDefinition != null && parameterDefinition instanceof ExtendedChoiceParameterDefinition) {
-							ExtendedChoiceParameterDefinition extendedChoiceParameterDefinition = (ExtendedChoiceParameterDefinition)parameterDefinition;
-							if(ExtendedChoiceParameterDefinition.PARAMETER_TYPE_JSON.equals(extendedChoiceParameterDefinition.getType()) && extendedChoiceParameterDefinition.isSaveJSONParameterToFile()) {
-								File jsonParametersDir = new File(build.getRootDir(), "parameters");
-								jsonParametersDir.mkdirs();
-								try {
-									File jsonParameterFile = new File(jsonParametersDir, getName() + ".json");
-									FileUtils.writeStringToFile(jsonParameterFile, value);
-									result = jsonParameterFile.getAbsolutePath();
-								}
-								catch(IOException e) {
-									LOGGER.log(Level.SEVERE, e.getMessage(), e);
+					if(build != null) {
+						ParametersDefinitionProperty parametersDefinitionProperty = build.getProject().getProperty(ParametersDefinitionProperty.class);
+						if(parametersDefinitionProperty != null) {
+							ParameterDefinition parameterDefinition = parametersDefinitionProperty.getParameterDefinition(name);
+							if(parameterDefinition != null && parameterDefinition instanceof ExtendedChoiceParameterDefinition) {
+								ExtendedChoiceParameterDefinition extendedChoiceParameterDefinition = (ExtendedChoiceParameterDefinition)parameterDefinition;
+								if(ExtendedChoiceParameterDefinition.PARAMETER_TYPE_JSON.equals(extendedChoiceParameterDefinition.getType()) && extendedChoiceParameterDefinition.isSaveJSONParameterToFile()) {
+									File jsonParametersDir = new File(build.getRootDir(), "parameters");
+									jsonParametersDir.mkdirs();
+									try {
+										File jsonParameterFile = new File(jsonParametersDir, getName() + ".json");
+										FileUtils.writeStringToFile(jsonParameterFile, value);
+										result = jsonParameterFile.getAbsolutePath();
+									}
+									catch(IOException e) {
+										LOGGER.log(Level.SEVERE, e.getMessage(), e);
+									}
 								}
 							}
 						}
 					}
-
 				}
-
 				return result;
 			}
 		};