#50 added additional check in case the configuration is empty

jenkinsci · Jul 21, 2021 · efe676f · efe676f
1 parent 8b53414
commit efe676f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/com/xpandit/plugins/xrayjenkins/model/ServerConfiguration.java b/src/main/java/com/xpandit/plugins/xrayjenkins/model/ServerConfiguration.java
@@ -29,6 +29,7 @@
 import java.util.stream.Collectors;
 import jenkins.model.GlobalConfiguration;
 import jenkins.model.Jenkins;
+import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -75,7 +76,8 @@ private void checkInvalidCloudCredentials(JSONObject formData) throws FormExcept
             return;
         }
         JSONObject xrayInstances = formData.getJSONObject("xrayinstance");
-        if (!xrayInstances.has("serverInstances")) {
+        if (!xrayInstances.has("serverInstances") ||
+                !(xrayInstances.get("serverInstances") instanceof JSONArray)) {
             return;
         }
         String xrayInstancesJson = xrayInstances.getJSONArray("serverInstances").toString();