You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2014/04/03 06:21:26 UTC
git commit: doc refinement
Repository: curator
Updated Branches:
refs/heads/CURATOR-74 [created] 4578b3f76
doc refinement
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/4578b3f7
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/4578b3f7
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/4578b3f7
Branch: refs/heads/CURATOR-74
Commit: 4578b3f76dbd4fed27c7f23ff47b01b105706d6a
Parents: 2ef7181
Author: randgalt <ra...@apache.org>
Authored: Wed Apr 2 23:20:59 2014 -0500
Committer: randgalt <ra...@apache.org>
Committed: Wed Apr 2 23:20:59 2014 -0500
----------------------------------------------------------------------
.../framework/recipes/locks/InterProcessLock.java | 13 +++++--------
.../framework/recipes/locks/InterProcessMutex.java | 4 ++--
2 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/4578b3f7/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessLock.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessLock.java b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessLock.java
index 7192eae..f942e3f 100644
--- a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessLock.java
+++ b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessLock.java
@@ -23,29 +23,26 @@ import java.util.concurrent.TimeUnit;
public interface InterProcessLock
{
/**
- * Acquire the mutex - blocking until it's available. Note: the same thread
- * can call acquire re-entrantly. Each call to acquire must be balanced by a call
+ * Acquire the mutex - blocking until it's available. Each call to acquire must be balanced by a call
* to {@link #release()}
*
- * @throws Exception ZK errors, interruptions, another thread owns the lock
+ * @throws Exception ZK errors, connection interruptions
*/
public void acquire() throws Exception;
/**
- * Acquire the mutex - blocks until it's available or the given time expires. Note: the same thread
- * can call acquire re-entrantly. Each call to acquire that returns true must be balanced by a call
+ * Acquire the mutex - blocks until it's available or the given time expires. Each call to acquire that returns true must be balanced by a call
* to {@link #release()}
*
* @param time time to wait
* @param unit time unit
* @return true if the mutex was acquired, false if not
- * @throws Exception ZK errors, interruptions, another thread owns the lock
+ * @throws Exception ZK errors, connection interruptions
*/
public boolean acquire(long time, TimeUnit unit) throws Exception;
/**
- * Perform one release of the mutex if the calling thread is the same thread that acquired it. If the
- * thread had made multiple calls to acquire, the mutex will still be held when this method returns.
+ * Perform one release of the mutex.
*
* @throws Exception ZK errors, interruptions, current thread does not own the lock
*/
http://git-wip-us.apache.org/repos/asf/curator/blob/4578b3f7/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessMutex.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessMutex.java b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessMutex.java
index 703cc8b..ffdeb70 100644
--- a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessMutex.java
+++ b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/locks/InterProcessMutex.java
@@ -69,7 +69,7 @@ public class InterProcessMutex implements InterProcessLock, Revocable<InterProce
* can call acquire re-entrantly. Each call to acquire must be balanced by a call
* to {@link #release()}
*
- * @throws Exception ZK errors, interruptions, another thread owns the lock
+ * @throws Exception ZK errors, connection interruptions
*/
@Override
public void acquire() throws Exception
@@ -88,7 +88,7 @@ public class InterProcessMutex implements InterProcessLock, Revocable<InterProce
* @param time time to wait
* @param unit time unit
* @return true if the mutex was acquired, false if not
- * @throws Exception ZK errors, interruptions, another thread owns the lock
+ * @throws Exception ZK errors, connection interruptions
*/
@Override
public boolean acquire(long time, TimeUnit unit) throws Exception