Do null check for model desc in case its metadata is broken
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7c9125f9 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7c9125f9 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7c9125f9 Branch: refs/heads/master Commit: 7c9125f94129771bb2a509cffbb679ad738fe03e Parents: 9af6a3f Author: nichunen <chunen...@kyligence.io> Authored: Wed Sep 20 21:29:38 2017 +0800 Committer: Hongbin Ma <m...@kyligence.io> Committed: Wed Sep 20 21:46:47 2017 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kylin/rest/service/QueryService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/7c9125f9/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java b/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java index 8a3e6b3..c73941c 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java @@ -701,8 +701,9 @@ public class QueryService extends BasicService { ProjectInstance projectInstance = getProjectManager().getProject(project); for (String modelName : projectInstance.getModels()) { - DataModelDesc dataModelDesc = modelService.listAllModels(modelName, project, true).get(0); - if (!dataModelDesc.isDraft()) { + + DataModelDesc dataModelDesc = modelService.getModel(modelName, project); + if (dataModelDesc != null && !dataModelDesc.isDraft()) { // update table type: FACT for (TableRef factTable : dataModelDesc.getFactTables()) {
