diff options
Diffstat (limited to 'common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java')
| -rw-r--r-- | common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java index 1092b8f24e..482933e399 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java @@ -402,7 +402,9 @@ public class PropertyDataDefinition extends ToscaDataDefinition implements Seria @Override public <T extends ToscaDataDefinition> T mergeFunction(T other, boolean allowDefaultValueOverride) { - if (this.getType().equals(other.getToscaPresentationValue(JsonPresentationFields.TYPE)) && compareSchemaType(other)) { + if (this.getType() != null && + this.getType().equals(other.getToscaPresentationValue(JsonPresentationFields.TYPE)) && + compareSchemaType(other)) { other.setOwnerId(getOwnerId()); if (allowDefaultValueOverride) { if (getDefaultValue() != null && !getDefaultValue().isEmpty()) { |