Rebase on upstream/master (this commit will be squashed later)

- Fix due to change in API around ACL checking in request processor
apache · Feb 15, 2017 · 0484ea9 · 0484ea9
1 parent 2c51e7a
commit 0484ea9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java b/src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java
@@ -436,9 +436,9 @@ public void processRequest(Request request) {
                 synchronized(n) {
                     aclG = n.acl;
                 }
-                PrepRequestProcessor.checkACL(zks, zks.getZKDatabase().convertLong(aclG),
+                PrepRequestProcessor.checkACL(zks, request.cnxn, zks.getZKDatabase().aclForNode(n),
                         ZooDefs.Perms.READ,
-                        request.authInfo);
+                        request.authInfo, getChildrenPaginatedRequest.getPath(), null);
                 final int maxReturned = getChildrenPaginatedRequest.getMaxReturned();
                 List<PathWithStat> list = zks.getZKDatabase().getPaginatedChildren(
                         getChildrenPaginatedRequest.getPath(), stat,