minor, fix NPE when filter Non-Cubing Job
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/fd745c88 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/fd745c88 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/fd745c88 Branch: refs/heads/master-hbase1.x Commit: fd745c8804848a60ac96eff1bd9b30bbe38bdafc Parents: 73a7c25 Author: Billy Liu <billy...@apache.org> Authored: Wed Dec 28 18:47:58 2016 +0800 Committer: Billy Liu <billy...@apache.org> Committed: Wed Dec 28 22:00:25 2016 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kylin/rest/service/JobService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/fd745c88/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java index ca8659c..4709a91 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java @@ -536,10 +536,13 @@ public class JobService extends BasicService implements InitializingBean { @Override public boolean apply(AbstractExecutable executable) { if (executable instanceof CubingJob) { - if (cubeName == null) { + if (StringUtils.isEmpty(cubeName)) { return true; } - return CubingExecutableUtil.getCubeName(executable.getParams()).equalsIgnoreCase(cubeName); + String executableCubeName = CubingExecutableUtil.getCubeName(executable.getParams()); + if (executableCubeName == null) + return true; + return executableCubeName.contains(cubeName); } else { return false; }
