diff options
| author |   Sonsino, Ofir (os0695) <os0695@intl.att.com> | 2019-05-08 10:34:06 +0300 |
|---|---|---|
| committer | Sonsino, Ofir (os0695) <os0695@intl.att.com> | 2019-05-08 10:34:06 +0300 |
| commit | 08f1f67956928d52427d101607f2e11d578d4b82 (patch) | |
| tree | 3cd7311a855306a949fa8556cb71f2b6a1be7027 | |
| parent | 66cd382cf5b543474b5291023a62a3be1f4f03d3 (diff) | |
Properties are missing in TOSCA fix
Change-Id: Iacceb798cb24408e232b9b59c751b0e984871728
Issue-ID: SDC-2283
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
| -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 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 |