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 2013/07/10 07:54:42 UTC
git commit: ZKPaths.makePath should return the valid path when the
child is /
Updated Branches:
refs/heads/2.1.1-incubating 9b81582da -> d5b470ad3
refs/heads/CURATOR-46 [created] d5b470ad3
ZKPaths.makePath should return the valid path when the child is /
Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/d5b470ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/d5b470ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/d5b470ad
Branch: refs/heads/2.1.1-incubating
Commit: d5b470ad302438657248f3c215f8ac9ea7bbdff2
Parents: 9b81582
Author: randgalt <ra...@apache.org>
Authored: Tue Jul 9 22:54:26 2013 -0700
Committer: randgalt <ra...@apache.org>
Committed: Tue Jul 9 22:54:26 2013 -0700
----------------------------------------------------------------------
curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/d5b470ad/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java b/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java
index 40c5bd7..57ee75a 100644
--- a/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java
+++ b/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java
@@ -212,7 +212,7 @@ public class ZKPaths
path.append("/");
}
path.append(parent);
- if ( (child == null) || (child.length() == 0) )
+ if ( (child == null) || (child.length() == 0) || (child.equals("/")))
{
return path.toString();
}