From 08f1f67956928d52427d101607f2e11d578d4b82 Mon Sep 17 00:00:00 2001 From: "Sonsino, Ofir (os0695)" Date: Wed, 8 May 2019 10:34:06 +0300 Subject: [PATCH] Properties are missing in TOSCA fix Change-Id: Iacceb798cb24408e232b9b59c751b0e984871728 Issue-ID: SDC-2283 Signed-off-by: Sonsino, Ofir (os0695) --- .../main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 -- 2.16.6