diff options
author | Tal Gitelman <tg851x@intl.att.com> | 2017-10-24 18:45:00 +0300 |
---|---|---|
committer | Tal Gitelman <tg851x@intl.att.com> | 2017-10-24 15:46:06 +0000 |
commit | 729eb6708fd48294c32da856c46515ff14a831d0 (patch) | |
tree | 0708a7fed61956e2b4801ee5837858527a4de92e /catalog-model/src/main | |
parent | e211e63edef1b88d8f7da53f3d1f0d5fb26d1555 (diff) |
align MME
- [BUG323816] Don't add a property to a newly generated csar if the
value is not set and the default value is not provided
Change-Id: I76b312ef8140ca6207aa7604026c1b0a89bfbe02
Issue-ID:SDC-500
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'catalog-model/src/main')
-rw-r--r-- | catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverter.java index 2d389f5fe5..f3b842e0cf 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverter.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/DataTypePropertyConverter.java @@ -35,7 +35,7 @@ public class DataTypePropertyConverter { */ public String getDataTypePropertiesDefaultValuesRec(String propertyDataType, Map<String, DataTypeDefinition> dataTypes) { JsonObject defaultValues = getDataTypePropsDefaultValuesRec(propertyDataType, dataTypes); - return !defaultValues.isJsonNull() ? gson.toJson(defaultValues) : null; + return !JsonUtils.isJsonNullOrEmpty(defaultValues) ? gson.toJson(defaultValues) : null; } /** |