Merge pull request #337 from checkmarx-ltd/develop

Branched project configuration fix #336
checkmarx-ltd · Jul 6, 2023 · dbe2972 · dbe2972
2 parents 7c066c7 + a2d12fa
commit dbe2972
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.github.checkmarx-ltd</groupId>
 	<artifactId>cx-spring-boot-sdk</artifactId>
-	<version>0.5.53</version>
+	<version>0.5.54</version>
 	<name>cx-spring-boot-sdk</name>
 	<description>Checkmarx Java Spring Boot SDK</description>
 	<properties>

diff --git a/src/main/java/com/checkmarx/sdk/service/CxService.java b/src/main/java/com/checkmarx/sdk/service/CxService.java
@@ -2161,19 +2161,29 @@ public Integer createScan(CxScanParams params, String comment) throws CheckmarxE
             }else if(cxProperties.getPostActionPostbackId() != null && cxProperties.getPostActionPostbackId() != 0){
                 createScanSetting(projectId, presetId, engineConfigurationId, cxProperties.getPostActionPostbackId(),
                         params.getEmailNotifications());
-                createScanSetting(baseProjectId, presetId, engineConfigurationId, cxProperties.getPostActionPostbackId(),
-                        params.getEmailNotifications());
+                if(cxProperties.getCxBranch())
+                {
+                    createScanSetting(baseProjectId, presetId, engineConfigurationId, cxProperties.getPostActionPostbackId(),
+                            params.getEmailNotifications());
+                }
+
             }else{
                 if(customTaskDetais!=null){
                     createScanSetting(projectId, presetId, engineConfigurationId, customTaskDetais.getId(),
                             params.getEmailNotifications());
-                    createScanSetting(baseProjectId, presetId, engineConfigurationId, customTaskDetais.getId(),
-                            params.getEmailNotifications());
+                    if(cxProperties.getCxBranch())
+                    {
+                        createScanSetting(baseProjectId, presetId, engineConfigurationId, cxProperties.getPostActionPostbackId(),
+                                params.getEmailNotifications());
+                    }
                 }else{
                     createScanSetting(projectId, presetId, engineConfigurationId, cxProperties.getPostActionPostbackId(),
                             params.getEmailNotifications());
-                    createScanSetting(baseProjectId, presetId, engineConfigurationId, cxProperties.getPostActionPostbackId(),
-                            params.getEmailNotifications());
+                    if(cxProperties.getCxBranch())
+                    {
+                        createScanSetting(baseProjectId, presetId, engineConfigurationId, cxProperties.getPostActionPostbackId(),
+                                params.getEmailNotifications());
+                    }
                 }
             }