ASA-9910

HCL-TECH-SOFTWARE · Nov 22, 2024 · 2023526 · 2023526
1 parent c5ab042
commit 2023526
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/com/hcl/appscan/sdk/CoreConstants.java b/src/main/java/com/hcl/appscan/sdk/CoreConstants.java
@@ -148,8 +148,8 @@ public interface CoreConstants {
 	String ERROR_GETTING_INFO			= "error.getting.info";									//$NON-NLS-1$
     String ERROR_URL_VALIDATION			= "error.url.validation";								//$NON-NLS-1$
     String FORMAT_PARAMS				= "FormatParams";								        //$NON-NLS-1$
-	String ERROR_GETTING_SCANLOG		= "error.getting.scanlog";								//$NON-NLS-1$
-	
+    String ERROR_GETTING_SCANLOG		= "error.getting.scanlog";								//$NON-NLS-1$
+    String ERROR_CANCEL_RESCAN  		= "error.cancel.rescan";								//$NON-NLS-1$
 	// ASE Status Messages
 	String CREATING_JOB                 = "message.creating.job";                               //$NON-NLS-1$
 	String CREATE_JOB_SUCCESS			= "message.created.job";								//$NON-NLS-1$

diff --git a/src/main/java/com/hcl/appscan/sdk/messages.properties b/src/main/java/com/hcl/appscan/sdk/messages.properties
@@ -57,6 +57,7 @@ error.getting.info=An error occurred getting information for {0} with id {1}.
 error.getting.scanlog=An error occurred retrieving the scan log.
 error.url.validation = An error occurred while validating the Starting URL: {0}.
 message.update.job = Updated the scan job parameters.
+error.cancel.rescan = The rescan may have been cancelled due to an issue. Please check the scan status on the AppScan server.
 
 #Presence
 error.getting.presence.details=An error occurred retrieving details for Presence with id {0}.

diff --git a/src/main/java/com/hcl/appscan/sdk/results/NonCompliantIssuesResultProvider.java b/src/main/java/com/hcl/appscan/sdk/results/NonCompliantIssuesResultProvider.java
@@ -58,8 +58,16 @@ protected void loadResults() {
                     return;
                 }
 
+                if (m_executionId != null && !m_executionId.isEmpty()) {
+                    String executionId = obj.getString(ID);
+                    if (executionId.equals(m_executionId)) {
+                        m_status = obj.getString(STATUS);
+                    } else {
+                        m_progress.setStatus(new Message(Message.INFO, Messages.getMessage(ERROR_CANCEL_RESCAN)));
+                        m_status = FAILED;
+                    }
+                }
 
-                m_status = obj.getString(STATUS);
                 if (FAILED.equalsIgnoreCase(m_status) && obj.has(USER_MESSAGE)) {
                     m_progress.setStatus(new Message(Message.ERROR, obj.getString(USER_MESSAGE)));
                     m_message = obj.getString(USER_MESSAGE);