summaryrefslogtreecommitdiffstats
path: root/catalog-be
diff options
context:
space:
mode:
authorLior Nachmias <lior.nachmias@intl.att.com>2018-12-04 13:56:49 +0200
committerLior Nachmias <lior.nachmias@intl.att.com>2018-12-04 14:26:34 +0000
commit50d55832a62f3c04de526ebc04ae34984d35121f (patch)
tree1febe1ef1d9b2fe8a73c1ae67ff3796265e44d79 /catalog-be
parent643c8933943cdc51a4128b8a3fa00da773ace4a7 (diff)
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)
Diffstat (limited to 'catalog-be')
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java1
1 files changed, 1 insertions, 0 deletions
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<Component, ResponseFormat> mergeStatusEither = compInstMergeDataBL.mergeComponentUserOrigData(user, dataHolder, containerComponent, containerComponentId, newComponentInstance.getUniqueId());
if (mergeStatusEither.isRight()) {
return Either.right(mergeStatusEither.right().value());