kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liy...@apache.org
Subject kylin git commit: KYLIN-2671 fix NPE
Date Wed, 05 Jul 2017 09:45:03 GMT
Repository: kylin
Updated Branches:
  refs/heads/2.0.x b903a1ba0 -> 69649e44e


KYLIN-2671 fix NPE


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

Branch: refs/heads/2.0.x
Commit: 69649e44e8a4cd9f9e684cbfe60649f708918cb9
Parents: b903a1b
Author: Hongbin Ma <mahongbin@apache.org>
Authored: Wed Jul 5 17:45:11 2017 +0800
Committer: Hongbin Ma <mahongbin@apache.org>
Committed: Wed Jul 5 17:45:11 2017 +0800

----------------------------------------------------------------------
 .../java/org/apache/kylin/rest/controller/QueryController.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/69649e44/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
index e9bddfd..069723f 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
@@ -79,7 +79,8 @@ public class QueryController extends BasicController {
     public SQLResponse prepareQuery(@RequestBody PrepareSqlRequest sqlRequest) {
 
         Map<String, String> newToggles = Maps.newHashMap();
-        newToggles.putAll(sqlRequest.getBackdoorToggles());
+        if (sqlRequest.getBackdoorToggles() != null)
+            newToggles.putAll(sqlRequest.getBackdoorToggles());
         newToggles.put(BackdoorToggles.DEBUG_TOGGLE_PREPARE_ONLY, "true");
         sqlRequest.setBackdoorToggles(newToggles);
 


Mime
View raw message