Apache/hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-17450 TablePermission#equals throws NPE after namespace support was added (huzheng)

Browse Source
This commit is contained in:
tedyu 2017-01-13 09:39:06 -08:00
parent 49b5a6e803
commit ee66ab8e29
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java
View File

@ -320,7 +320,8 @@ public class TablePermission extends Permission {
}
TablePermission other = (TablePermission)obj;
if (!(table.equals(other.getTableName()) &&
if (!(((table == null && other.getTableName() == null) ||
(table != null && table.equals(other.getTableName()))) &&
((family == null && other.getFamily() == null) ||
Bytes.equals(family, other.getFamily())) &&
((qualifier == null && other.getQualifier() == null) ||

11
hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java
View File

@ -84,6 +84,8 @@ public class TestTablePermissions {
}
};
private static String TEST_NAMESPACE = "perms_test_ns";
private static String TEST_NAMESPACE2 = "perms_test_ns2";
private static TableName TEST_TABLE =
TableName.valueOf("perms_test");
private static TableName TEST_TABLE2 =
@ -400,6 +402,15 @@ public class TestTablePermissions {
p2 = new TablePermission(TEST_TABLE, null);
assertFalse(p1.equals(p2));
assertFalse(p2.equals(p1));
p1 = new TablePermission(TEST_NAMESPACE, TablePermission.Action.READ);
p2 = new TablePermission(TEST_NAMESPACE, TablePermission.Action.READ);
assertEquals(p1, p2);
p1 = new TablePermission(TEST_NAMESPACE, TablePermission.Action.READ);
p2 = new TablePermission(TEST_NAMESPACE2, TablePermission.Action.READ);
assertFalse(p1.equals(p2));
assertFalse(p2.equals(p1));
}
@Test