Repository: kylin
Updated Branches:
  refs/heads/yang22-cdh5.7 9c5554db1 -> eb6a55457 (forced update)


KYLIN-2138 bug fix again


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/1e0e9a64
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/1e0e9a64
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/1e0e9a64

Branch: refs/heads/yang22-cdh5.7
Commit: 1e0e9a64f07eb0d53ef5f58850b6e9baf1e36d6c
Parents: 37dffd7
Author: Hongbin Ma <mahong...@apache.org>
Authored: Wed Dec 28 10:22:33 2016 +0800
Committer: Hongbin Ma <mahong...@apache.org>
Committed: Wed Dec 28 10:22:33 2016 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/kylin/rest/service/QueryService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/1e0e9a64/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 de28b17..bc644cc 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
@@ -327,7 +327,8 @@ public class QueryService extends BasicService {
         }
 
         final String queryId = UUID.randomUUID().toString();
-        BackdoorToggles.addToggles(sqlRequest.getBackdoorToggles());
+        if (sqlRequest.getBackdoorToggles() != null)
+            BackdoorToggles.addToggles(sqlRequest.getBackdoorToggles());
         QueryContext.setQueryId(queryId);
 
         try (SetThreadName ignored = new SetThreadName("Query %s", queryId)) {

Reply via email to