From 52c6fb010eee08dee5f09f4f57823d49f6471646 Mon Sep 17 00:00:00 2001 From: "Sonsino, Ofir (os0695)" Date: Wed, 8 May 2019 10:34:06 +0300 Subject: Properties are missing in TOSCA fix Change-Id: Iacceb798cb24408e232b9b59c751b0e984871728 Issue-ID: SDC-2283 Signed-off-by: Sonsino, Ofir (os0695) (cherry picked from commit 08f1f67956928d52427d101607f2e11d578d4b82) --- .../main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'catalog-be/src/main/java') 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 5cafec2bda..0813650b3a 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 @@ -559,8 +559,10 @@ public class ToscaExportHandler { // merge component properties and inputs properties mergedProperties.putAll(convertedProperties); } - 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); } -- cgit 1.2.3-korg