You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by vi...@apache.org on 2018/12/19 19:18:09 UTC

phoenix git commit: PHOENIX-5070 NPE when upgrading Phoenix 4.13.0 to Phoenix 4.14.1 with hbase-1.x branch in secure setup

Repository: phoenix
Updated Branches:
  refs/heads/master 69d2d7692 -> 85ab5d616


PHOENIX-5070 NPE when upgrading Phoenix 4.13.0 to Phoenix 4.14.1 with hbase-1.x branch in secure setup


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/85ab5d61
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/85ab5d61
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/85ab5d61

Branch: refs/heads/master
Commit: 85ab5d616bfefee9c23e70a29b6733861694af9f
Parents: 69d2d76
Author: Monani Mihir <mo...@gmail.com>
Authored: Wed Dec 19 22:46:39 2018 +0530
Committer: Vincent Poon <vi...@apache.org>
Committed: Wed Dec 19 11:17:46 2018 -0800

----------------------------------------------------------------------
 .../org/apache/phoenix/coprocessor/PhoenixAccessController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/85ab5d61/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
index 0448972..d07f4f7 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
@@ -419,7 +419,7 @@ public class PhoenixAccessController extends BaseMetaDataEndpointObserver {
                 final List<UserPermission> userPermissions = new ArrayList<UserPermission>();
                 try (Connection connection = ConnectionFactory.createConnection(env.getConfiguration())) {
                     // Merge permissions from all accessController coprocessors loaded in memory
-                    for (MasterObserver service : accessControllers) {
+                    for (MasterObserver service : getAccessControllers()) {
                         // Use AccessControlClient API's if the accessController is an instance of org.apache.hadoop.hbase.security.access.AccessController
                         if (service.getClass().getName().equals(org.apache.hadoop.hbase.security.access.AccessController.class.getName())) {
                             userPermissions.addAll(AccessControlClient.getUserPermissions(connection, tableName.getNameAsString()));