You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/07/25 09:44:55 UTC
[08/24] kylin git commit: KYLIN-2671 fix NPE
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/24fe4212
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/24fe4212
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/24fe4212
Branch: refs/heads/2.1.x
Commit: 24fe4212b44418266a160b5e70adc49c6eeeb974
Parents: 78018d3
Author: Hongbin Ma <ma...@apache.org>
Authored: Tue Jul 18 14:26:05 2017 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Tue Jul 18 14:26:05 2017 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/rest/controller/QueryController.java | 3 ++-
.../java/org/apache/kylin/rest/controller2/QueryControllerV2.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/24fe4212/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 b44f66f..44b5e72 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
@@ -83,7 +83,8 @@ public class QueryController extends BasicController {
@ResponseBody
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);
http://git-wip-us.apache.org/repos/asf/kylin/blob/24fe4212/server-base/src/main/java/org/apache/kylin/rest/controller2/QueryControllerV2.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller2/QueryControllerV2.java b/server-base/src/main/java/org/apache/kylin/rest/controller2/QueryControllerV2.java
index 9343d4f..2ef4415 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/controller2/QueryControllerV2.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/controller2/QueryControllerV2.java
@@ -89,7 +89,8 @@ public class QueryControllerV2 extends BasicController {
@ResponseBody
public EnvelopeResponse prepareQueryV2(@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);