From 6b58f89d940d56bfda38b5f86ef5a86ee29f80cf Mon Sep 17 00:00:00 2001
From: MichaelMorris <michael.morris@est.tech>
Date: Wed, 25 Oct 2023 15:49:29 +0100
Subject: [PATCH] Fix adding null schema to non list properties

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-4668
Change-Id: I815ff21b8394b858627f7798d7fdcd5326b6eb6b
---
 .../src/main/java/org/openecomp/sdc/be/tosca/CommonCsarGenerator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CommonCsarGenerator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CommonCsarGenerator.java
index d5c64db76b..0e3328f4d8 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CommonCsarGenerator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CommonCsarGenerator.java
@@ -748,7 +748,7 @@ public class CommonCsarGenerator {
 
     private Object getValue(final String key, Map<String, Object> value) {
         final String mappedKey = mapKey(key);
-        if (mappedKey.equals("schemaType")) {
+        if (mappedKey.equals("schemaType") && value.get(mappedKey) != null) {
             return Collections.singletonMap("type", value.get(mappedKey));
         }
         return value.get(mappedKey);
-- 
2.16.6