From efe676f87902b678eb5e2fa70a5cf1f659bd2afa Mon Sep 17 00:00:00 2001 From: Hugo Braz Date: Wed, 21 Jul 2021 10:03:34 +0100 Subject: [PATCH] #50 added additional check in case the configuration is empty --- .../plugins/xrayjenkins/model/ServerConfiguration.java | 4 +++- 1 file changed, 3 insertions(+), 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 index cff530e..6c2bd96 100644 --- 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();