Repository: kylin Updated Branches: refs/heads/2.0.x-hbase0.98 2bc4f2283 -> b4738c237 (forced update)
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-hbase0.98 Commit: 69649e44e8a4cd9f9e684cbfe60649f708918cb9 Parents: b903a1b Author: Hongbin Ma <mahong...@apache.org> Authored: Wed Jul 5 17:45:11 2017 +0800 Committer: Hongbin Ma <mahong...@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);
