Merge pull request #269 from Checkmarx/fix/benalvo/error-starting-ide

Add try-catch to update scan (AST-65497)

Author: OrShamirCM

src/main/java/com/checkmarx/intellij/tool/window/actions/CancelScanAction.java

@@ -52,12 +52,18 @@ public void run(@NotNull ProgressIndicator progressIndicator) {
 
     @Override
     public void update(@NotNull AnActionEvent e) {
-        super.update(e);
+        try {
+            super.update(e);
 
-        e.getPresentation().setVisible(StartScanAction.getUserHasPermissionsToScan());
+            e.getPresentation().setVisible(StartScanAction.getUserHasPermissionsToScan());
 
-        PropertiesComponent propertiesComponent = PropertiesComponent.getInstance(Objects.requireNonNull(e.getProject()));
-        boolean isScanRunning = StringUtils.isNotBlank(propertiesComponent.getValue(Constants.RUNNING_SCAN_ID_PROPERTY));
-        e.getPresentation().setEnabled(isScanRunning);
+            PropertiesComponent propertiesComponent = PropertiesComponent.getInstance(Objects.requireNonNull(e.getProject()));
+            boolean isScanRunning = StringUtils.isNotBlank(propertiesComponent.getValue(Constants.RUNNING_SCAN_ID_PROPERTY));
+            e.getPresentation().setEnabled(isScanRunning);
+        }
+        catch (Exception ex) {
+            ex.printStackTrace();
+            e.getPresentation().setEnabled(false);
+        }
     }
 }

src/main/java/com/checkmarx/intellij/tool/window/actions/StartScanAction.java

@@ -265,27 +265,33 @@ private void loadResults(com.checkmarx.ast.scan.Scan scan) {
 
     @Override
     public void update(@NotNull AnActionEvent e) {
-        super.update(e);
+        try {
+            super.update(e);
 
-        e.getPresentation().setVisible(getUserHasPermissionsToScan());
+            e.getPresentation().setVisible(getUserHasPermissionsToScan());
 
-        cxToolWindowPanel = getCxToolWindowPanel(e);
-        workspaceProject = e.getProject();
-        propertiesComponent = PropertiesComponent.getInstance(Objects.requireNonNull(workspaceProject));
-        boolean isScanRunning = StringUtils.isNotBlank(propertiesComponent.getValue(Constants.RUNNING_SCAN_ID_PROPERTY));
-        String storedProject = propertiesComponent.getValue(Constants.SELECTED_PROJECT_PROPERTY);
-        String storedBranch = propertiesComponent.getValue(Constants.SELECTED_BRANCH_PROPERTY);
+            cxToolWindowPanel = getCxToolWindowPanel(e);
+            workspaceProject = e.getProject();
+            propertiesComponent = PropertiesComponent.getInstance(Objects.requireNonNull(workspaceProject));
+            boolean isScanRunning = StringUtils.isNotBlank(propertiesComponent.getValue(Constants.RUNNING_SCAN_ID_PROPERTY));
+            String storedProject = propertiesComponent.getValue(Constants.SELECTED_PROJECT_PROPERTY);
+            String storedBranch = propertiesComponent.getValue(Constants.SELECTED_BRANCH_PROPERTY);
 
-        boolean projectAndBranchSelected = StringUtils.isNotBlank(storedProject) && StringUtils.isNotBlank(storedBranch);
+            boolean projectAndBranchSelected = StringUtils.isNotBlank(storedProject) && StringUtils.isNotBlank(storedBranch);
 
-        // Check if IDE was restarted and there's a scan still running
-        if(isScanRunning && !isPollingScan && !actionInitialized) {
-            pollScan(propertiesComponent.getValue(Constants.RUNNING_SCAN_ID_PROPERTY));
-        }
+            // Check if IDE was restarted and there's a scan still running
+            if (isScanRunning && !isPollingScan && !actionInitialized) {
+                pollScan(propertiesComponent.getValue(Constants.RUNNING_SCAN_ID_PROPERTY));
+            }
 
-        actionInitialized = true;
+            actionInitialized = true;
 
-        e.getPresentation().setEnabled(!isScanRunning && !isPollingScan && !scanTriggered && projectAndBranchSelected);
+            e.getPresentation().setEnabled(!isScanRunning && !isPollingScan && !scanTriggered && projectAndBranchSelected);
+        }
+        catch (Exception ex) {
+            LOGGER.error(ex);
+            e.getPresentation().setEnabled(false);
+        }
     }
 
     /**