Fix 'Changing VFC version on template wipes previously assigned property values based...

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / components / merge / property / DataDefinitionsValuesMergingBusinessLogic.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/DataDefinitionsValuesMergingBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/DataDefinitionsValuesMergingBusinessLogic.java
index 6f1a1e1..c64e2ef 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/DataDefinitionsValuesMergingBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/DataDefinitionsValuesMergingBusinessLogic.java
@@ -67,6 +67,9 @@ public class DataDefinitionsValuesMergingBusinessLogic {
     private void mergeInstanceDefinition(MergePropertyData mergeData) {
         if (isSameType(mergeData.getOldProp(), mergeData.getNewProp())) {
             propertyValueMergeBL.mergePropertyValue(mergeData.getOldProp(), mergeData.getNewProp(), mergeData.getGetInputNamesToMerge());
+            if (mergeData.getOldProp().isToscaFunction()) {
+                mergeData.getNewProp().setToscaFunction(mergeData.getOldProp().getToscaFunction());
+            }
         }
     }