diff options
author | Bharath Balasubramanian <bharathb@research.att.com> | 2020-04-08 16:54:26 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-04-08 16:54:26 +0000 |
commit | efdd05004d6ecf018e6e39e1613b5691aff69ef5 (patch) | |
tree | b40cc6f44e17c54b5c3410409344c52277041fbc /music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java | |
parent | 90d1e3551488a73e74fb54d320be6e29678ca270 (diff) | |
parent | 1aafd3ff1cbf1827ded174efd2659539b7f80dac (diff) |
Merge "some code smells removed"
Diffstat (limited to 'music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java')
-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=?;"; |