Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 15AC418E57 for ; Mon, 8 Feb 2016 23:13:46 +0000 (UTC) Received: (qmail 64919 invoked by uid 500); 8 Feb 2016 23:13:42 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 64778 invoked by uid 500); 8 Feb 2016 23:13:42 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 64164 invoked by uid 99); 8 Feb 2016 23:13:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Feb 2016 23:13:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 100D7E6990; Mon, 8 Feb 2016 23:13:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: syuanjiang@apache.org To: commits@hbase.apache.org Date: Mon, 08 Feb 2016 23:13:51 -0000 Message-Id: <47290dfaaa7d45aaa97003a3b6d40ba8@git.apache.org> In-Reply-To: <4e51f2fec6ac4dc19a2cfa71c5a7677d@git.apache.org> References: <4e51f2fec6ac4dc19a2cfa71c5a7677d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/32] hbase git commit: Amend HBASE-15200 ZooKeeper znode ACL checks should only compare the shortname Amend HBASE-15200 ZooKeeper znode ACL checks should only compare the shortname Fixes for newly introduced FindBugs warnings Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b80325fb Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b80325fb Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b80325fb Branch: refs/heads/hbase-12439 Commit: b80325fb1b6ad4735c8b2cb259b1430eddefd7b7 Parents: f4d9597 Author: Andrew Purtell Authored: Thu Feb 4 16:17:41 2016 -0800 Committer: Andrew Purtell Committed: Thu Feb 4 17:33:32 2016 -0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b80325fb/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java index 2bf4119..36a9bc5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java @@ -293,7 +293,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable { if (Ids.ANYONE_ID_UNSAFE.equals(id)) { if (perms != Perms.READ) { if (LOG.isDebugEnabled()) { - LOG.debug(String.format("permissions for '%s' are not correct: have %0x, want %0x", + LOG.debug(String.format("permissions for '%s' are not correct: have 0x%x, want 0x%x", id, perms, Perms.READ)); } return false; @@ -301,7 +301,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable { } else if (superUsers != null && isSuperUserId(superUsers, id)) { if (perms != Perms.ALL) { if (LOG.isDebugEnabled()) { - LOG.debug(String.format("permissions for '%s' are not correct: have %0x, want %0x", + LOG.debug(String.format("permissions for '%s' are not correct: have 0x%x, want 0x%x", id, perms, Perms.ALL)); } return false; @@ -316,8 +316,8 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable { if (name.equals(hbaseUser)) { if (perms != Perms.ALL) { if (LOG.isDebugEnabled()) { - LOG.debug(String.format("permissions for '%s' are not correct: have %0x, want %0x", - id.toString(), perms, Perms.ALL)); + LOG.debug(String.format("permissions for '%s' are not correct: have 0x%x, want 0x%x", + id, perms, Perms.ALL)); } return false; } @@ -352,7 +352,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable { } else { if (LOG.isDebugEnabled()) { LOG.debug(String.format( - "superuser '%s' does not have correct permissions: have %0x, want %0x", + "superuser '%s' does not have correct permissions: have 0x%x, want 0x%x", acl.getId().getId(), acl.getPerms(), Perms.ALL)); } }