summaryrefslogtreecommitdiffstats
path: root/node-repository/src
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2017-08-08 13:02:08 +0200
committerGitHub <noreply@github.com>2017-08-08 13:02:08 +0200
commit2a5fe0adb6be61d4ffba5289131aeaafa6e1babb (patch)
treec0fc558ce79badf9a09aac0b79edfeb5763ecb70 /node-repository/src
parent82e328d65cb4d7e431cddbc5f48e2c52f2c5ec13 (diff)
parent6b0a33c6f2433e91251053d2b88b9f31ecdda9bf (diff)
Merge pull request #3061 from yahoo/bratseth/use-mock-locks-when-possible
Create a mock lock in Lock when possible
Diffstat (limited to 'node-repository/src')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java
index a6e058e72f3..12a0496ed2e 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java
@@ -60,7 +60,7 @@ public class CuratorDatabase {
/** Create a reentrant lock */
// Locks are not cached in the in-memory state
public Lock lock(Path path, Duration timeout) {
- Lock lock = locks.computeIfAbsent(path, (pathArg) -> new Lock(pathArg.getAbsolute(), curator.framework()));
+ Lock lock = locks.computeIfAbsent(path, (pathArg) -> new Lock(pathArg.getAbsolute(), curator));
lock.acquire(timeout);
return lock;
}