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/01/31 20:04:26 UTC

svn commit: r1238748 - /incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/security/ZKAuthenticator.java

Author: ecn
Date: Tue Jan 31 19:04:25 2012
New Revision: 1238748

URL: http://svn.apache.org/viewvc?rev=1238748&view=rev
Log:
ACCUMULO-357 small window for a node to be deleted found by the randomwalk test

Modified:
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/security/ZKAuthenticator.java

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/security/ZKAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/security/ZKAuthenticator.java?rev=1238748&r1=1238747&r2=1238748&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/security/ZKAuthenticator.java (original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/security/ZKAuthenticator.java Tue Jan 31 19:04:25 2012
@@ -370,6 +370,9 @@ public final class ZKAuthenticator imple
       if (Tool.convertSystemPermissions(perms).contains(permission))
         return true;
       zooCache.clear(ZKUserPath + "/" + user + ZKUserSysPerms);
+      perms = zooCache.get(ZKUserPath + "/" + user + ZKUserSysPerms);
+      if (perms == null)
+        return false;
       return Tool.convertSystemPermissions(zooCache.get(ZKUserPath + "/" + user + ZKUserSysPerms)).contains(permission);
     }
     throw new AccumuloSecurityException(user, SecurityErrorCode.USER_DOESNT_EXIST); // user doesn't exist