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 29424183DD for ; Fri, 5 Feb 2016 01:51:23 +0000 (UTC) Received: (qmail 65898 invoked by uid 500); 5 Feb 2016 01:51:23 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 65855 invoked by uid 500); 5 Feb 2016 01:51:23 -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 65846 invoked by uid 99); 5 Feb 2016 01:51:23 -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; Fri, 05 Feb 2016 01:51:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CB0C3E0B31; Fri, 5 Feb 2016 01:51:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: apurtell@apache.org To: commits@hbase.apache.org Date: Fri, 05 Feb 2016 01:51:23 -0000 Message-Id: In-Reply-To: <54e28c0d8245461498524ecf0b8b55a6@git.apache.org> References: <54e28c0d8245461498524ecf0b8b55a6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] 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/7f42fcd6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7f42fcd6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7f42fcd6 Branch: refs/heads/branch-1.0 Commit: 7f42fcd6f9db1decd06dfb9484dd22c5704dd917 Parents: b43442c Author: Andrew Purtell Authored: Thu Feb 4 16:17:41 2016 -0800 Committer: Andrew Purtell Committed: Thu Feb 4 17:00:23 2016 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/7f42fcd6/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 983153f..3ad3a20 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 @@ -297,7 +297,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; @@ -312,7 +312,7 @@ 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", + LOG.debug(String.format("permissions for '%s' are not correct: have 0x%x, want 0x%x", id, perms, Perms.ALL)); } return false; @@ -348,7 +348,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)); } }