MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Small refactor

This commit is contained in:
George Kalampokis 2020-02-14 10:37:24 +02:00
parent a8fa0312d1
commit c50cae7f6c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dmp-backend/web/src/main/java/eu/eudat/logic/managers/LockManager.java
View File

@ -57,9 +57,7 @@ public class LockManager {
this.createOrUpdate(new Lock().fromDataModel(lock), principal); this.createOrUpdate(new Lock().fromDataModel(lock), principal);
return false; return false;
} }
if (this.forceUnlock(targetId) > 0){ return this.forceUnlock(targetId) > 0;
return true;
}
} else if (availableLocks > 1) { } else if (availableLocks > 1) {
this.forceUnlock(targetId); this.forceUnlock(targetId);
return this.isLocked(targetId, principal); return this.isLocked(targetId, principal);
@ -71,7 +69,7 @@ public class LockManager {
LockCriteria criteria = new LockCriteria(); LockCriteria criteria = new LockCriteria();
criteria.setTarget(UUID.fromString(targetId)); criteria.setTarget(UUID.fromString(targetId));
Long availableLocks = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).count(); Long availableLocks = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).count();
Long deletedLocks = 0L; long deletedLocks = 0L;
if (availableLocks > 0) { if (availableLocks > 0) {
List<eu.eudat.data.entities.Lock> locks = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).toList(); List<eu.eudat.data.entities.Lock> locks = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).toList();
for (eu.eudat.data.entities.Lock lock : locks) { for (eu.eudat.data.entities.Lock lock : locks) {