summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-09-14 16:25:51 +0200
committerGitHub <noreply@github.com>2018-09-14 16:25:51 +0200
commitf6cc5cac228e5f9a28ad2468c51bd9a734787d9d (patch)
tree5014d53812ff3ff3beea427c6b281dc31d75fa2b
parent765f997386b5d4c7c27722c1c0eec25c25c68331 (diff)
parent9104110f67492eebba885b69868a0ee47a00e830 (diff)
Merge pull request #6947 from vespa-engine/hmusum/remove-deprecated-constructor
Remove deprecated and unused constructor
-rw-r--r--zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java11
1 files changed, 1 insertions, 10 deletions
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java
index d71660a990f..23fa3cccad2 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java
@@ -3,15 +3,13 @@ package com.yahoo.vespa.curator;
import com.google.common.util.concurrent.UncheckedTimeoutException;
import com.yahoo.transaction.Mutex;
-import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.recipes.locks.InterProcessLock;
-import org.apache.curator.framework.recipes.locks.InterProcessMutex;
import java.time.Duration;
import java.util.concurrent.TimeUnit;
/**
- * A cluster-wide reentrant mutex which is released on (the last symmetric) close
+ * A cluster-wide re-entrant mutex which is released on (the last symmetric) close
*
* @author bratseth
*/
@@ -20,13 +18,6 @@ public class Lock implements Mutex {
private final InterProcessLock mutex;
private final String lockPath;
- /** @deprecated pass a Curator instance instead */
- @Deprecated
- public Lock(String lockPath, CuratorFramework curator) {
- this.lockPath = lockPath;
- mutex = new InterProcessMutex(curator, lockPath);
- }
-
public Lock(String lockPath, Curator curator) {
this.lockPath = lockPath;
mutex = curator.createMutex(lockPath);