diff options
author | Indrijeet kumar <indriku1@in.ibm.com> | 2020-04-01 19:11:29 +0530 |
---|---|---|
committer | Indrijeet kumar <indriku1@in.ibm.com> | 2020-04-01 19:14:46 +0530 |
commit | 1aafd3ff1cbf1827ded174efd2659539b7f80dac (patch) | |
tree | 43a274a6480303ac0679f24b55abc9a5fc3dc503 /music-core/src/main/java/org/onap/music/lockingservice | |
parent | 6a5d1a3202655810abd5d557e9abc6180bbb95a1 (diff) |
some code smells removed
some code smells removed
Issue-ID: PORTAL-869
Change-Id: I54235879743bbd31fa3b12df5c527b876c66ea00
Signed-off-by: Indrijeet Kumar <indriku1@in.ibm.com>
Diffstat (limited to 'music-core/src/main/java/org/onap/music/lockingservice')
-rw-r--r-- | music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java b/music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java index f1e0e08b..0c5d39c8 100644 --- a/music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java +++ b/music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java @@ -467,8 +467,10 @@ public class CassaLockStore { } public boolean checkForDeadlock(String keyspace, String table, String lockName, LockType locktype, String owner, boolean forAcquire) throws MusicServiceException, MusicQueryException { - if (locktype.equals(LockType.READ)) return false; - if (owner==null || owner.length()==0) return false; + if (locktype.equals(LockType.READ)) + return false; + if (owner==null || owner.length()==0) + return false; String lockTable = table_prepend_name + table; PreparedQueryObject queryObject = new PreparedQueryObject(); @@ -487,7 +489,8 @@ public class CassaLockStore { ddu.setExisting(row.getString("key"), row.getString("owner"), ("0".equals(row.getString("acquiretime")))?OwnershipType.CREATED:OwnershipType.ACQUIRED); } boolean deadlock = ddu.checkForDeadlock(lockName, owner, forAcquire?OwnershipType.ACQUIRED:OwnershipType.CREATED); - if (deadlock) logger.warn("Deadlock detected when " + owner + " tried to create lock on " + keyspace + "." + lockTable + "." + lockName); + if (deadlock) + logger.warn("Deadlock detected when " + owner + " tried to create lock on " + keyspace + "." + lockTable + "." + lockName); return deadlock; } @@ -516,7 +519,7 @@ public class CassaLockStore { } public ReturnType promoteLock(String keyspace, String table, String key, String lockRef) - throws MusicLockingException, MusicServiceException, MusicQueryException { + throws MusicServiceException, MusicQueryException { String lockqtable = table_prepend_name + table; String selectQuery = "select * from " + keyspace + "." + lockqtable + " where key=?;"; |