Fix possible NPE reported in JENKINS-23841

jenkinsci · Jul 21, 2014 · d8fff43 · d8fff43
1 parent 7a3872d
commit d8fff43
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/main/java/com/nullin/jenkins/spbr/SimpleParameterizedBuildsReportAction.java b/src/main/java/com/nullin/jenkins/spbr/SimpleParameterizedBuildsReportAction.java
@@ -74,15 +74,17 @@ public Multimap<Map<String, String>, AbstractBuild> getBuildsMap(Collection<Abst
             }
         }
 
-        final ParametersDefinitionProperty paramDefProp = project.getProperty(ParametersDefinitionProperty.class);
+        ParametersDefinitionProperty paramDefProp = project.getProperty(ParametersDefinitionProperty.class);
         Set<String> latestParamKeySet = new HashSet<String>();
-        for (final ParameterDefinition definition : paramDefProp.getParameterDefinitions()) {
-            if (definition.getType().equals(PasswordParameterDefinition.class.getSimpleName())) {
-                continue;
-            }
-            final String name = definition.getName();
-            if (shouldBeVisible(name, selectedParams, isInclude)) {
-                latestParamKeySet.add(name);
+        if (paramDefProp != null) {
+            for (final ParameterDefinition definition : paramDefProp.getParameterDefinitions()) {
+                if (definition.getType().equals(PasswordParameterDefinition.class.getSimpleName())) {
+                    continue;
+                }
+                final String name = definition.getName();
+                if (shouldBeVisible(name, selectedParams, isInclude)) {
+                    latestParamKeySet.add(name);
+                }
             }
         }