summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-09-15 16:28:24 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-09-15 16:28:24 +0200
commitdae4621a9fb3d74c3a782918261b13711f703738 (patch)
treec440203693d84b9148cd50bc6e0d9141482fb599
parent147b113228e8df694e1bc37bed082fa90cd9df1f (diff)
Used passed timeout
-rw-r--r--vespajlib/src/main/java/com/yahoo/concurrent/Locks.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/Locks.java b/vespajlib/src/main/java/com/yahoo/concurrent/Locks.java
index 5235aee8cc6..ab167392329 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/Locks.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/Locks.java
@@ -51,7 +51,7 @@ public class Locks<TYPE> {
public Lock lock(TYPE key, long timeout, TimeUnit timeoutUnit) {
try {
ReentrantLock lock = locks.computeIfAbsent(key, k -> new ReentrantLock(true));
- boolean acquired = lock.tryLock(timeoutMs, TimeUnit.MILLISECONDS);
+ boolean acquired = lock.tryLock(timeout, timeoutUnit);
if ( ! acquired)
throw new UncheckedTimeoutException("Timed out waiting for the lock to " + key);
return new Lock(lock);