You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by ec...@apache.org on 2012/07/11 16:20:09 UTC

svn commit: r1360187 - /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java

Author: ecn
Date: Wed Jul 11 14:20:08 2012
New Revision: 1360187

URL: http://svn.apache.org/viewvc?rev=1360187&view=rev
Log:
ACCUMULO-684: prevent an NPE when a user is being deleted while we are changing their permissions

Modified:
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java

Modified: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java?rev=1360187&r1=1360186&r2=1360187&view=diff
==============================================================================
--- accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java (original)
+++ accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java Wed Jul 11 14:20:08 2012
@@ -223,7 +223,7 @@ public class ZooUtil {
     
     List<String> children = zc.getChildren(path);
     
-    if (children.size() == 0) {
+    if (children == null || children.size() == 0) {
       return null;
     }