diff options
author | Bharath Balasubramanian <bharathb@research.att.com> | 2018-06-07 20:25:03 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-06-07 20:25:03 +0000 |
commit | 5e5d6ed9badebfbc1cc65a90e3de8dad232f9e42 (patch) | |
tree | 4be095aec105a581336c8e0fd8a0e725fbda8395 /src/main/java/org/onap/music/conductor | |
parent | 43dba6f628b7c97cfcfec66118b574a4a1ea8b10 (diff) | |
parent | 05585a1df490fb548f43cff120410c253745cf9a (diff) |
Merge "Document Updates and Bug Fixes"
Diffstat (limited to 'src/main/java/org/onap/music/conductor')
-rw-r--r-- | src/main/java/org/onap/music/conductor/conditionals/MusicContional.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/main/java/org/onap/music/conductor/conditionals/MusicContional.java b/src/main/java/org/onap/music/conductor/conditionals/MusicContional.java index 93e34721..492f7c62 100644 --- a/src/main/java/org/onap/music/conductor/conditionals/MusicContional.java +++ b/src/main/java/org/onap/music/conductor/conditionals/MusicContional.java @@ -95,7 +95,7 @@ public class MusicContional { if (lockAcqResult.getResult().equals(ResultType.SUCCESS)) { ReturnType criticalPutResult = conditionalInsertAtomic(lockId, keyspace, tablename, primaryKey, queryBank); - MusicCore.destroyLockRef(lockId); + MusicCore.releaseLock(lockId, true); if (criticalPutResult.getMessage().contains("insert")) criticalPutResult .setMessage("Insert values: "); @@ -105,11 +105,11 @@ public class MusicContional { return criticalPutResult; } else { - MusicCore.destroyLockRef(lockId); + MusicCore.releaseLock(lockId, true); return lockAcqResult; } } catch (Exception e) { - MusicCore.destroyLockRef(lockId); + MusicCore.releaseLock(lockId, true); return new ReturnType(ResultType.FAILURE, e.getMessage()); } @@ -163,15 +163,17 @@ public class MusicContional { try { if (lockAcqResult.getResult().equals(ResultType.SUCCESS)) { - return updateAtomic(lockId, keyspace, tableName, primaryKey,primaryKeyValue, queryBank,planId,cascadeColumnValues,cascadeColumnName); + ReturnType updateResult= updateAtomic(lockId, keyspace, tableName, primaryKey,primaryKeyValue, queryBank,planId,cascadeColumnValues,cascadeColumnName); + MusicCore.releaseLock(lockId, true); + return updateResult; } else { - MusicCore.destroyLockRef(lockId); + MusicCore.releaseLock(lockId, true); return lockAcqResult; } } catch (Exception e) { - MusicCore.destroyLockRef(lockId); + MusicCore.releaseLock(lockId, true); return new ReturnType(ResultType.FAILURE, e.getMessage()); } |