ASA-8145

Meaningful message to be conveyed when Jenkins loses connection to ASoC while scan is in progress.
HCL-TECH-SOFTWARE · Feb 22, 2024 · 443415d · 443415d
1 parent ac726b8
commit 443415d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/com/hcl/appscan/sdk/results/NonCompliantIssuesResultProvider.java b/src/main/java/com/hcl/appscan/sdk/results/NonCompliantIssuesResultProvider.java
@@ -37,7 +37,7 @@ public NonCompliantIssuesResultProvider(String scanId, String type, IScanService
 	protected void loadResults() {
 		try {
 			JSONObject items = m_scanProvider.getScanDetails(m_scanId);
-			JSONObject obj = items.getJSONObject(LATEST_EXECUTION);
+			JSONObject obj = items == null ? null : items.getJSONObject(LATEST_EXECUTION);
 			if (obj == null) {
 				m_status = FAILED;
 				return;

diff --git a/src/main/java/com/hcl/appscan/sdk/scan/CloudScanServiceProvider.java b/src/main/java/com/hcl/appscan/sdk/scan/CloudScanServiceProvider.java
@@ -147,7 +147,11 @@ public JSONObject getScanDetails(String scanId) throws IOException, JSONExceptio
 		if (response.getResponseCode() == HttpsURLConnection.HTTP_OK || response.getResponseCode() == HttpsURLConnection.HTTP_CREATED){
 			JSONObject obj = (JSONObject) response.getResponseBodyAsJSON();
 			JSONArray array = (JSONArray) obj.get(ITEMS);
-			return (JSONObject) array.getJSONObject(0);
+			if(array.isEmpty()) {
+				m_progress.setStatus(new Message(Message.ERROR, Messages.getMessage(ERROR_GETTING_DETAILS, scanId)));
+			} else {
+				return (JSONObject) array.getJSONObject(0);
+			}
 		} else if (response.getResponseCode() == -1) {
 			return new JSONObject().put(STATUS,UNKNOWN); //If the server is not reachable Internet disconnect
 		} else if (response.getResponseCode() != HttpsURLConnection.HTTP_BAD_REQUEST) {