diff options
| author |   Sonsino, Ofir (os0695) <os0695@intl.att.com> | 2019-05-08 10:34:06 +0300 |
|---|---|---|
| committer |   Yuli Shlosberg <ys9693@att.com> | 2019-05-17 09:33:20 +0000 |
| commit | 52c6fb010eee08dee5f09f4f57823d49f6471646 (patch) | |
| tree | 014853d8b9d00653334e043dcf10a5c031e588db | |
| parent | d642660b5eeed87a3f1de737e7cf7840fd2bf121 (diff) | |
Properties are missing in TOSCA fix
Change-Id: Iacceb798cb24408e232b9b59c751b0e984871728
Issue-ID: SDC-2283
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
(cherry picked from commit 08f1f67956928d52427d101607f2e11d578d4b82)
| -rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java | 6 |
1 files 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 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); } |