hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject [1/6] hbase git commit: Amend HBASE-15200 ZooKeeper znode ACL checks should only compare the shortname
Date Fri, 05 Feb 2016 01:51:22 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 8172c6c4b -> f6e5c3290
  refs/heads/branch-1 846a2f31c -> 1b420be56
  refs/heads/branch-1.0 b43442c58 -> 7f42fcd6f
  refs/heads/branch-1.1 bc564d3a6 -> 1a23f4126
  refs/heads/branch-1.2 0e36afd2d -> d52625de8
  refs/heads/master f4d9597e1 -> b80325fb1


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/1a23f412
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1a23f412
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1a23f412

Branch: refs/heads/branch-1.1
Commit: 1a23f4126412254d54bf720da471f7cfd9fb9394
Parents: bc564d3
Author: Andrew Purtell <apurtell@apache.org>
Authored: Thu Feb 4 16:17:41 2016 -0800
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Thu Feb 4 16:59:39 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/1a23f412/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 08a089c..49b32c9 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
@@ -303,7 +303,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;
@@ -318,7 +318,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;
@@ -354,7 +354,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));
               }
             }


Mime
View raw message