aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core
diff options
context:
space:
mode:
authortalig <talig@amdocs.com>2017-10-23 09:23:14 +0300
committertalig <talig@amdocs.com>2017-10-23 09:23:14 +0300
commitf4398a841ce8c4c185ab75abdf5e5a1c2d8ff784 (patch)
tree05a536d22c52a0b3a8ca5135ea9a17d3be833a24 /openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core
parent6c416937323340a10095cfc2eb70229759fc4b92 (diff)
Fix onboarding undo checkout impl
Fix reset in zusammen collaboration plugin, Throw explicit exception in case of zusammen db illegal state. Change-Id: Ic9463517b72c7a89a2de78b86da5679ac57371a6 Issue-ID: SDC-490 Signed-off-by: talig <talig@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core')
-rw-r--r--openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/impl/VersioningManagerImpl.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/impl/VersioningManagerImpl.java b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/impl/VersioningManagerImpl.java
index 0bbe3f81e7..4a49d5391f 100644
--- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/impl/VersioningManagerImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/impl/VersioningManagerImpl.java
@@ -492,11 +492,12 @@ public class VersioningManagerImpl implements VersioningManager {
versionInfoEntity.setActiveVersion(userCandidateVersion.getVersion());
versionInfoEntity.getViewableVersions().add(versionInfoEntity.getActiveVersion());
versionInfoEntity.setStatus(VersionStatus.Available);
- versionInfoDao.update(versionInfoEntity);
closeVersionOnEntity(versionInfoEntity.getEntityType(), versionInfoEntity.getEntityId(),
versionInfoEntity.getActiveVersion());
+ versionInfoDao.update(versionInfoEntity);
+
return versionInfoEntity.getActiveVersion();
}