Repository: kylin Updated Branches: refs/heads/2.0-rc 3c98b7374 -> e3ad70eef
minor,acl update skip if cubeInstance is null Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e3ad70ee Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e3ad70ee Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e3ad70ee Branch: refs/heads/2.0-rc Commit: e3ad70eeffcbfa243d57f7c8918283b81bc606b0 Parents: 3c98b73 Author: janzhongi <[email protected]> Authored: Tue Jan 26 14:42:09 2016 +0800 Committer: janzhongi <[email protected]> Committed: Tue Jan 26 14:42:22 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/rest/controller/ProjectController.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/e3ad70ee/server/src/main/java/org/apache/kylin/rest/controller/ProjectController.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/controller/ProjectController.java b/server/src/main/java/org/apache/kylin/rest/controller/ProjectController.java index abebdd8..07fcc91 100644 --- a/server/src/main/java/org/apache/kylin/rest/controller/ProjectController.java +++ b/server/src/main/java/org/apache/kylin/rest/controller/ProjectController.java @@ -149,6 +149,9 @@ public class ProjectController extends BasicController { List<CubeInstance> cubeInstances = cubeService.listAllCubes(projectInstance.getName()); for (CubeInstance cubeInstance : cubeInstances) { + if(cubeInstance == null){ + continue; + } boolean hasCubePermission = false; AclEntity cubeAe = accessService.getAclEntity("CubeInstance", cubeInstance.getId()); Acl cubeAcl = accessService.getAcl(cubeAe);
