Repository: kylin Updated Branches: refs/heads/2.x-staging 81ca14e99 -> da32969a0
minor, patch a NPE in CubeService.isCubeInProject() and CubeService.listAllCubes() Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/da32969a Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/da32969a Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/da32969a Branch: refs/heads/2.x-staging Commit: da32969a0322f47323576c095803debea1af26e2 Parents: 81ca14e Author: janzhongi <jiazh...@ebay.com> Authored: Tue Feb 16 11:24:55 2016 +0800 Committer: janzhongi <jiazh...@ebay.com> Committed: Tue Feb 16 11:24:55 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/rest/service/CubeService.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/da32969a/server/src/main/java/org/apache/kylin/rest/service/CubeService.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/service/CubeService.java b/server/src/main/java/org/apache/kylin/rest/service/CubeService.java index 0d8d4d5..c3a19f6 100644 --- a/server/src/main/java/org/apache/kylin/rest/service/CubeService.java +++ b/server/src/main/java/org/apache/kylin/rest/service/CubeService.java @@ -216,8 +216,10 @@ public class CubeService extends BasicService { for (RealizationEntry projectDataModel : project.getRealizationEntries()) { if (projectDataModel.getType() == RealizationType.CUBE) { CubeInstance cube = getCubeManager().getCube(projectDataModel.getRealization()); - assert cube != null; - result.add(cube); + if (cube != null) + result.add(cube); + else + logger.error("Cube instance " + projectDataModel.getRealization() + " is failed to load"); } } return result; @@ -232,7 +234,10 @@ public class CubeService extends BasicService { for (RealizationEntry projectDataModel : project.getRealizationEntries()) { if (projectDataModel.getType() == RealizationType.CUBE) { CubeInstance cube = getCubeManager().getCube(projectDataModel.getRealization()); - assert cube != null; + if (cube == null) { + logger.error("Project " + projectName + " contains realization " + projectDataModel.getRealization() + " which is not found by CubeManager"); + continue; + } if (cube.equals(target)) { return true; }
