Merge with master

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..2ac53bdb963 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, TimeUnit.MILLISECONDS);
             if ( ! acquired)
                 throw new UncheckedTimeoutException("Timed out waiting for the lock to " + key);
             return new Lock(lock);