You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/10/12 13:51:16 UTC
[2/4] kylin git commit: minor, fix NPE in ACL ValidateUtil getALlUsers
minor, fix NPE in ACL ValidateUtil getALlUsers
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5fbd9525
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5fbd9525
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5fbd9525
Branch: refs/heads/2.2.x
Commit: 5fbd9525d1dbe0892675f94c38df93b625fefa9e
Parents: bd7cb9c
Author: Billy Liu <bi...@apache.org>
Authored: Sat Sep 30 15:04:19 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Sat Sep 30 16:14:10 2017 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/rest/util/ValidateUtil.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/5fbd9525/server-base/src/main/java/org/apache/kylin/rest/util/ValidateUtil.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/util/ValidateUtil.java b/server-base/src/main/java/org/apache/kylin/rest/util/ValidateUtil.java
index abb326f..7e513ae 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/util/ValidateUtil.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/util/ValidateUtil.java
@@ -122,8 +122,10 @@ public class ValidateUtil {
ProjectInstance prj = projectService.getProjectManager().getProject(project);
AclEntity ae = accessService.getAclEntity("ProjectInstance", prj.getUuid());
Acl acl = accessService.getAcl(ae);
- for (AccessControlEntry ace : acl.getEntries()) {
- allUsers.add(((PrincipalSid) ace.getSid()).getPrincipal());
+ if (acl != null && acl.getEntries() != null) {
+ for (AccessControlEntry ace : acl.getEntries()) {
+ allUsers.add(((PrincipalSid) ace.getSid()).getPrincipal());
+ }
}
return allUsers;
}