commit e801b41d1aeaa13abac1caf1c6a899ae21dc83d2
author Thomas Wolf <thomas.wolf@paranor.ch> Mon Sep 16 23:31:29 2019 +0200
committer Lars Vogel <Lars.Vogel@vogella.com> Tue Sep 17 06:29:24 2019 -0400
tree 8984e3697b190e6606a7c0090f2a9610d2ffd72c
parent 8f8806deac61ca42f4f91257e346f8a616ca7cfc

Bug 551056 - Simplify LockManager using HashMap.computeIfAbsent()

Besides being simpler this will also be a tiny bit faster since it
hashes and finds a table entry only once.

Change-Id: Ic6b907bf59af9e142199f471d4b726bfbe264ffd
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>

bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/LockManager.java

diff --git a/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/LockManager.java b/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/LockManager.java
index f01f788..250dbb2 100644
--- a/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/LockManager.java
+++ b/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/LockManager.java
@@ -158,11 +158,7 @@
 			for (int i = 0; i < toSuspend.length; i++)
 				suspended[i] = LockState.suspend((OrderedLock) toSuspend[i]);
 			synchronized (suspendedLocks) {
-				ArrayDeque<LockState[]> prevLocks = suspendedLocks.get(found.getCandidate());
-				if (prevLocks == null)
-					prevLocks = new ArrayDeque<>();
-				prevLocks.push(suspended);
-				suspendedLocks.put(found.getCandidate(), prevLocks);
+				suspendedLocks.computeIfAbsent(found.getCandidate(), key -> new ArrayDeque<>()).push(suspended);
 			}
 		} catch (Exception e) {
 			handleInternalError(e);