summaryrefslogtreecommitdiffstats
path: root/catalog-model/src/main
diff options
context:
space:
mode:
authorTal Gitelman <tg851x@intl.att.com>2017-10-24 18:45:00 +0300
committerTal Gitelman <tg851x@intl.att.com>2017-10-24 18:45:00 +0300
commit3a7c314a597a7ceda028696b9542be15e747b2af (patch)
treef19c33d0dd48954560dfa59217f17cd41719b0bb /catalog-model/src/main
parenteeec4b98a8a9ddcde80ce0260038d5b9191fc832 (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.java2
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;
}
/**