[JENKINS-35544] Fix NPE when module has no version.

jenkinsci · Aug 2, 2016 · 7e538e8 · 7e538e8
1 parent 0be1fc4
commit 7e538e8
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/drupal/beans/DrushInvocation.java b/src/main/java/org/jenkinsci/plugins/drupal/beans/DrushInvocation.java
@@ -36,6 +36,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Objects;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
@@ -219,7 +220,12 @@ public Map<String, DrupalExtension> getProjects(boolean modulesOnly, boolean ena
 		}
 		for (Object name: entries.keySet()) {
 			JSONObject entry = (JSONObject) entries.get(name);
-			DrupalExtension project = new DrupalExtension(name.toString(), entry.get("type").toString(), entry.get("status").toString(), entry.get("version").toString());
+			DrupalExtension project = new DrupalExtension(
+				Objects.toString(name, ""),
+				Objects.toString(entry.get("type"), ""),
+				Objects.toString(entry.get("status"), ""),
+				Objects.toString(entry.get("version"), "")
+			);
 			projects.put(name.toString(), project);
 		}