You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by an...@apache.org on 2019/01/29 14:58:25 UTC
[zookeeper] branch branch-3.4 updated: Fix typos
This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new b69c2d3 Fix typos
b69c2d3 is described below
commit b69c2d3e29d84a1666840a872a8a32498d382ca5
Author: Jingguo Yao <ya...@gmail.com>
AuthorDate: Tue Jan 29 15:57:36 2019 +0100
Fix typos
I think that this change is too trivial to need a JIRA issue. If a JIRA issue is needed, i can create it.
Author: Jingguo Yao <ya...@gmail.com>
Reviewers: fangmin@apache.org, andor@apache.org
Closes #777 from yaojingguo/fix-typos
(cherry picked from commit 22e4acc802904231d537ae18f479cfc729851d87)
Signed-off-by: Andor Molnar <an...@apache.org>
---
zookeeper-docs/src/main/resources/markdown/recipes.md | 2 +-
.../src/main/java/org/apache/zookeeper/ZooKeeper.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zookeeper-docs/src/main/resources/markdown/recipes.md b/zookeeper-docs/src/main/resources/markdown/recipes.md
index 8ae82cf..b6646ad 100644
--- a/zookeeper-docs/src/main/resources/markdown/recipes.md
+++ b/zookeeper-docs/src/main/resources/markdown/recipes.md
@@ -213,7 +213,7 @@ Clients wishing to obtain a lock do the following:
1. The client calls **exists( )** with
the watch flag set on the path in the lock directory with the next
lowest sequence number.
-1. if **exists( )** returns false, go
+1. if **exists( )** returns null, go
to step **2**. Otherwise, wait for a
notification for the pathname from the previous step before going to
step **2**.
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeper.java b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeper.java
index 3e46ee7..03c8b0d 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeper.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeper.java
@@ -1499,7 +1499,7 @@ public class ZooKeeper {
* Return the list of the children of the node of the given path.
* <p>
* If the watch is non-null and the call is successful (no exception is thrown),
- * a watch will be left on the node with the given path. The watch willbe
+ * a watch will be left on the node with the given path. The watch will be
* triggered by a successful operation that deletes the node of the given
* path or creates/delete a child under the node.
* <p>
@@ -1548,7 +1548,7 @@ public class ZooKeeper {
* Return the list of the children of the node of the given path.
* <p>
* If the watch is true and the call is successful (no exception is thrown),
- * a watch will be left on the node with the given path. The watch willbe
+ * a watch will be left on the node with the given path. The watch will be
* triggered by a successful operation that deletes the node of the given
* path or creates/delete a child under the node.
* <p>
@@ -1613,7 +1613,7 @@ public class ZooKeeper {
* For the given znode path return the stat and children list.
* <p>
* If the watch is non-null and the call is successful (no exception is thrown),
- * a watch will be left on the node with the given path. The watch willbe
+ * a watch will be left on the node with the given path. The watch will be
* triggered by a successful operation that deletes the node of the given
* path or creates/delete a child under the node.
* <p>
@@ -1669,7 +1669,7 @@ public class ZooKeeper {
* For the given znode path return the stat and children list.
* <p>
* If the watch is true and the call is successful (no exception is thrown),
- * a watch will be left on the node with the given path. The watch willbe
+ * a watch will be left on the node with the given path. The watch will be
* triggered by a successful operation that deletes the node of the given
* path or creates/delete a child under the node.
* <p>