summaryrefslogtreecommitdiffstats
path: root/catalog-model/src/main/java
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-10-25 10:13:48 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-25 10:13:48 +0000
commitd2469cabc662eef291f55f791700bd8c7c6ded10 (patch)
tree2788cbbcfa61c86f46ed3fdf5f2e2897aba82675 /catalog-model/src/main/java
parentfa9d07d3ed584cadbb44de89c886d92591eae23f (diff)
parent3a7c314a597a7ceda028696b9542be15e747b2af (diff)
Merge "align MME" into release-1.1.0
Diffstat (limited to 'catalog-model/src/main/java')
-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;
}
/**