[sdc] update code of sdc

[sdc.git] / common-be / src / main / java / org / openecomp / sdc / be / datatypes / elements / PropertyDataDefinition.java

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 4c79852..e669d66 100644 (file)
--- 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
@@ -354,7 +354,7 @@ public class PropertyDataDefinition extends ToscaDataDefinition implements Seria
        
        @Override
        public <T extends ToscaDataDefinition> T mergeFunction(T other, boolean allowDefaultValueOverride){
-               if(this.getType().equals(other.getType()) && compareSchemaType(other)){
+               if(this.getType().equals(other.getToscaPresentationValue(JsonPresentationFields.TYPE)) && compareSchemaType(other)){
                        other.setOwnerId(getOwnerId());
                        if(allowDefaultValueOverride)
                                other.setToscaPresentationValue(JsonPresentationFields.DEFAULT_VALUE, getDefaultValue());