From c50cae7f6cabcacec0e861e1a6901c1cd6ce5796 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Fri, 14 Feb 2020 10:37:24 +0200 Subject: [PATCH] Small refactor --- .../src/main/java/eu/eudat/logic/managers/LockManager.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LockManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LockManager.java index 46a900e3e..d9cc0a41f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LockManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LockManager.java @@ -57,9 +57,7 @@ public class LockManager { this.createOrUpdate(new Lock().fromDataModel(lock), principal); return false; } - if (this.forceUnlock(targetId) > 0){ - return true; - } + return this.forceUnlock(targetId) > 0; } else if (availableLocks > 1) { this.forceUnlock(targetId); return this.isLocked(targetId, principal); @@ -71,7 +69,7 @@ public class LockManager { LockCriteria criteria = new LockCriteria(); criteria.setTarget(UUID.fromString(targetId)); Long availableLocks = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).count(); - Long deletedLocks = 0L; + long deletedLocks = 0L; if (availableLocks > 0) { List locks = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).toList(); for (eu.eudat.data.entities.Lock lock : locks) {