From 68a5130850f758cf4b10288d52124dd8d2942c33 Mon Sep 17 00:00:00 2001
From: umeshwaghode <77615542+umeshwaghode@users.noreply.github.com>
Date: Tue, 6 Sep 2022 20:02:02 +0530
Subject: [PATCH] Fix custom field verification NPE issue (#107)

---
 gradle.properties                                      | 2 +-
 src/main/java/com/checkmarx/jenkins/CxScanBuilder.java | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 850a7f79..9c2029a9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 description = Provides automatic scan of code by Checkmarx server and shows results summary and trend in Jenkins interface.
 group = com.checkmarx.jenkins
-version = 2022.3.2
+version = 2022.3.3
 
 repositoryVersion=
 
diff --git a/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java b/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java
index b4900456..17ed3212 100644
--- a/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java
+++ b/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java
@@ -1335,10 +1335,12 @@ private CxScanConfig resolveConfiguration(Run<?, ?> run, DescriptorImpl descript
         ret.setMvnPath(descriptor.getMvnPath());
         ret.setOsaGenerateJsonReport(false);
         
-        if(!verifyCustomCharacters(getCustomFields())) {
-        	throw new CxClientException("Custom Fields must have given format: key1:val1,key2:val2. \\nCustom field allows to use these special characters: # . _ ");
+        if(StringUtils.isNotEmpty(getCustomFields())) {
+	        if(!verifyCustomCharacters(getCustomFields())) {
+	        	throw new CxClientException("Custom Fields must have given format: key1:val1,key2:val2. \\nCustom field allows to use these special characters: # . _ ");
+	        }
+	        ret.setCustomFields(apiFormat(getCustomFields()));
         }
-        ret.setCustomFields(apiFormat(getCustomFields()));
         ret.setForceScan(isForceScan());
 
         //cx server