aboutsummaryrefslogtreecommitdiffstats
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 13:56:49 +0200
commit0151d9cc6fc3a9db776c8eeaa4db4123af45d746 (patch)
tree796e9dee33729733cebcd7900b5b0f40577f40a7
parentbacc715f10f5c648d61f0720120b14aadebf9a77 (diff)
Change VF version failure - bug fix.
Change-Id: I933fba8f03686d46755b8f9ea06a819ef9356140 Issue-ID: SDC-1971 Signed-off-by: Lior Nachmias <lior.nachmias@intl.att.com>
-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 e92f5f3ebe..8c7c47391d 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());