Change VF version failure - bug fix.

Change-Id: I933fba8f03686d46755b8f9ea06a819ef9356140
Issue-ID: SDC-1971
Signed-off-by: Lior Nachmias <lior.nachmias@intl.att.com>
(cherry picked from commit 0151d9cc6fc3a9db776c8eeaa4db4123af45d746)

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
index 299f818..eeefebb 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
@@ -2236,6 +2236,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
                 return resultOp;
             }
 
+            dataHolder.setCurrInstanceNode(origComponent);
             Either<Component, ResponseFormat> mergeStatusEither = compInstMergeDataBL.mergeComponentUserOrigData(user, dataHolder, containerComponent, containerComponentId, newComponentInstance.getUniqueId());
             if (mergeStatusEither.isRight()) {
                 return Either.right(mergeStatusEither.right().value());