From 50d55832a62f3c04de526ebc04ae34984d35121f Mon Sep 17 00:00:00 2001 From: Lior Nachmias Date: Tue, 4 Dec 2018 13:56:49 +0200 Subject: Change VF version failure - bug fix. Change-Id: I933fba8f03686d46755b8f9ea06a819ef9356140 Issue-ID: SDC-1971 Signed-off-by: Lior Nachmias (cherry picked from commit 0151d9cc6fc3a9db776c8eeaa4db4123af45d746) --- .../openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java | 1 + 1 file changed, 1 insertion(+) (limited to 'catalog-be/src') 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 299f8184dd..eeefebb327 100644 --- 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 mergeStatusEither = compInstMergeDataBL.mergeComponentUserOrigData(user, dataHolder, containerComponent, containerComponentId, newComponentInstance.getUniqueId()); if (mergeStatusEither.isRight()) { return Either.right(mergeStatusEither.right().value()); -- cgit 1.2.3-korg