Repository: kylin
Updated Branches:
  refs/heads/yang22-hbase102 58180883a -> 8ca0b1af3 (forced update)


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/7e747831
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7e747831
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7e747831

Branch: refs/heads/yang22-hbase102
Commit: 7e7478319e45532b4eae0de49ac14c4d7e1491b9
Parents: 1e0e9a6
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 18:47:58 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/7e747831/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;
                 }

Reply via email to