From 26ffac7f0f508f73a1b0701bc3897d0259409a35 Mon Sep 17 00:00:00 2001 From: talig Date: Tue, 24 Oct 2017 20:23:35 +0300 Subject: Fix VSP resubmit all impl Change-Id: I080425eb0115712da9a3d52f24d1b513cfb58291 Issue-ID: SDC-529 Signed-off-by: talig --- .../impl/VendorSoftwareProductManagerImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main') diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java index dde5d61663..ceb635fc74 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java @@ -832,21 +832,20 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa public Version healAndAdvanceFinalVersion(String vspId, VspDetails vendorSoftwareProductInfo, String user) throws IOException { - Version checkoutFinalVersion = checkout(vspId, user); - autoHeal(vspId, checkoutFinalVersion, vendorSoftwareProductInfo, user); - Version checkinFinalVersion = checkin(vspId, user); + Version checkoutVersion = checkout(vspId, user); + autoHeal(vspId, checkoutVersion, vendorSoftwareProductInfo, user); + Version checkinVersion = checkin(vspId, user); ValidationResponse response = Objects.requireNonNull(submit(vspId, user), "Null response not expected"); if (!response.isValid()) { - return checkout(vspId, user); + return checkinVersion; } - Version finalVersion = checkinFinalVersion.calculateNextFinal(); + Version finalVersion = checkinVersion.calculateNextFinal(); createPackage(vspId, finalVersion, user); return finalVersion; - } @Override -- cgit 1.2.3-korg