From 460b149b216cd785932d7d3faf521c0882600928 Mon Sep 17 00:00:00 2001
From: MichaelMorris <michael.morris@est.tech>
Date: Mon, 23 Oct 2023 10:47:21 +0100
Subject: [PATCH] Fix error merging node types

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-4664
Change-Id: I90dae030e099b2d2936120342335534a031e98a7
---
 .../src/main/java/org/openecomp/sdc/be/tosca/CommonCsarGenerator.java  | 3 ++-
 1 file changed, 2 insertions(+), 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 7b55f32f71..d5c64db76b 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
@@ -764,11 +764,12 @@ public class CommonCsarGenerator {
         return key;
     }
 
+    @SuppressWarnings("unchecked")
     private Map<String, Object> createProperties(final Object value) {
         final Map<String, Object> propertiesMap = new HashMap<>();
         propertiesMap.put("type", ((Map<String, Object>) value).get("type"));
         propertiesMap.put("required", ((Map<String, Object>) value).get("required"));
-        final Object entrySchema = ((Map<String, Object>) value).get("entry_schema");
+        final Object entrySchema = getValue("entry_schema", (Map<String, Object>) value);
         if (entrySchema != null) {
             propertiesMap.put("entry_schema", entrySchema);
         }
-- 
2.16.6