From a8dbb2d9204bd48eee6c4795d933be436f35ada6 Mon Sep 17 00:00:00 2001
From: satyamchaurasiapersistent
 <102941840+satyamchaurasiapersistent@users.noreply.github.com>
Date: Thu, 30 May 2024 16:51:04 +0530
Subject: [PATCH] fix for bitbucket commit (#1358)

Co-authored-by: Satyam Chaurasia <samchaurasia86@gmail.com>
---
 .../com/checkmarx/flow/service/ResultsService.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/checkmarx/flow/service/ResultsService.java b/src/main/java/com/checkmarx/flow/service/ResultsService.java
index cdc1bafc5..2f736fea1 100644
--- a/src/main/java/com/checkmarx/flow/service/ResultsService.java
+++ b/src/main/java/com/checkmarx/flow/service/ResultsService.java
@@ -147,40 +147,40 @@ public void processResults(ScanRequest request, ScanResults results, ScanDetails
                     log.info("Results Service case JIRA : request =:  {}  results = {}  scanDetails= {}", request.toString(), results.toString(), scanDetails.toString());
                     break;
                 case GITHUBPULL:
-                    if (gitService.isScanSubmittedComment()) {
+                    if (gitService.isScanSubmittedComment() && request.getScanSubmittedComment()) {
                         gitService.processPull(request, results);
                         gitService.endBlockMerge(request, results, scanDetails);
                     }
                     break;
                 case GITLABCOMMIT:
-                    if (gitLabService.isScanSubmittedComment()) {
+                    if (gitLabService.isScanSubmittedComment() && request.getScanSubmittedComment() ) {
                         gitLabService.processCommit(request, results);
                     }
                     break;
                 case GITLABMERGE:
-                    if (gitLabService.isScanSubmittedComment()) {
+                    if (gitLabService.isScanSubmittedComment() && request.getScanSubmittedComment()) {
                         gitLabService.processMerge(request, results);
                         gitLabService.endBlockMerge(request);
                     }
                     break;
                 case BITBUCKETCOMMIT:
-                    if (bbService.isScanSubmittedComment()) {
+                    if (bbService.isScanSubmittedComment() && request.getScanSubmittedComment()) {
                         bbService.processCommit(request, results);
                     }
                     break;
                 case BITBUCKETPULL:
-                    if (bbService.isScanSubmittedComment()) {
+                    if (bbService.isScanSubmittedComment() && request.getScanSubmittedComment()) {
                         bbService.processMerge(request, results);
                     }
                     break;
                 case BITBUCKETSERVERPULL:
-                    if (bbService.isScanSubmittedComment()) {
+                    if (bbService.isScanSubmittedComment() && request.getScanSubmittedComment()) {
                         bbService.processServerMerge(request, results, scanDetails);
                         bbService.setBuildEndStatus(request, results, scanDetails);
                     }
                     break;
                 case ADOPULL:
-                    if (adoService.isScanSubmittedComment()) {
+                    if (adoService.isScanSubmittedComment() && request.getScanSubmittedComment()) {
                         adoService.processPull(request, results);
                         adoService.endBlockMerge(request, results, scanDetails);
                     }