diff options
| author |   Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com> | 2018-06-07 15:43:03 -0400 |
|---|---|---|
| committer | Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com> | 2018-06-07 15:59:49 -0400 |
| commit | 05585a1df490fb548f43cff120410c253745cf9a (patch) | |
| tree | 312823654c1336032726a896e646328fd0c45df5 /src/main/java/org/onap/music/conductor | |
| parent | 03ade18ac83ab02ee1ce0d6d43725b96513b4577 (diff) | |
Document Updates and Bug Fixes
Added latest Bug Fix
Change-Id: I6e40e50a3e077c81f8098582b718bc60e39f8253
Issue-ID: MUSIC-76
Signed-off-by: Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com>
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()); } |