diff options
author | Valerij Fredriksen <valerijf@oath.com> | 2017-09-20 18:17:38 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@oath.com> | 2017-09-22 09:13:01 +0200 |
commit | 3af3ef7791eca3e5db3f6d7c3952ac725cf0845c (patch) | |
tree | 1ddba2848695f7c08413bb31fb994311a8867a1f | |
parent | 74181a6ae752c716dba3653153ae4bb8ff74112e (diff) |
Use lock instead
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/concurrent/lock/Locking.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/lock/Locking.java b/vespajlib/src/main/java/com/yahoo/concurrent/lock/Locking.java index cbfadf73a32..4d9f45e959e 100644 --- a/vespajlib/src/main/java/com/yahoo/concurrent/lock/Locking.java +++ b/vespajlib/src/main/java/com/yahoo/concurrent/lock/Locking.java @@ -2,7 +2,6 @@ package com.yahoo.concurrent.lock; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; /** @@ -19,12 +18,8 @@ public class Locking { * @return the acquired lock */ public Lock lock(Class<?> key) { - try { - ReentrantLock lock = locks.computeIfAbsent(key, k -> new ReentrantLock(true)); - lock.tryLock(Long.MAX_VALUE, TimeUnit.NANOSECONDS); - return new Lock(lock); - } catch (InterruptedException e) { - throw new RuntimeException("Interrupted while waiting for lock of " + key); - } + ReentrantLock lock = locks.computeIfAbsent(key, k -> new ReentrantLock(true)); + lock.lock(); + return new Lock(lock); } } |