Updated Branches: refs/heads/1.4.5-SNAPSHOT 6d6ca9d9e -> 6593a9f54 refs/heads/1.5.1-SNAPSHOT 8981ba04e -> 295643ab0 refs/heads/1.6.0-SNAPSHOT 332149304 -> 19da920aa refs/heads/master c4af6f26d -> 0524ddbfb
ACCUMULO-2252 Backport ACCUMULO-684 to 1.4.x A one-line manual backport of the one-line fix in ACCUMULO-684. The ZooUtil class modified here is the one residing under the fate component in later releases. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6593a9f5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6593a9f5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6593a9f5 Branch: refs/heads/1.4.5-SNAPSHOT Commit: 6593a9f5466e465ea7b8d46edfdef0544c42ada9 Parents: 6d6ca9d Author: Bill Havanki <bhava...@cloudera.com> Authored: Fri Jan 24 15:22:06 2014 -0500 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Fri Jan 24 15:22:06 2014 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6593a9f5/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java ---------------------------------------------------------------------- diff --git a/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java b/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java index 7d490c5..cfbe5ef 100644 --- a/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java +++ b/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java @@ -236,7 +236,7 @@ public class ZooUtil { List<String> children = zc.getChildren(path); - if (children.size() == 0) { + if (children == null || children.size() == 0) { return null; }
