From: Sonsino, Ofir (os0695) <os0695@intl.att.com>
Date: Wed, 8 May 2019 07:34:06 +0000 (+0300)
Subject: Properties are missing in TOSCA fix
X-Git-Tag: 1.4.1~19
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=08f1f67956928d52427d101607f2e11d578d4b82;p=sdc.git

Properties are missing in TOSCA fix

Change-Id: Iacceb798cb24408e232b9b59c751b0e984871728
Issue-ID: SDC-2283
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
---

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
index 54cf4cf096..60503f8f3a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
@@ -556,8 +556,10 @@ public class ToscaExportHandler {
                     property -> propertyConvertor.convertProperty(dataTypes, property,
                             PropertyConvertor.PropertyType.PROPERTY)));
         }
-        if (MapUtils.isNotEmpty(mergedProperties) && Objects.nonNull(inputDef)) {
-            resolveDefaultPropertyValue(inputDef, mergedProperties, dataTypes);
+        if (MapUtils.isNotEmpty(mergedProperties)) {
+            if (Objects.nonNull(inputDef)) {
+                resolveDefaultPropertyValue(inputDef, mergedProperties, dataTypes);
+            }
             toscaNodeType.setProperties(mergedProperties);
         }
         // Extracted to method for code reuse