[kylin] branch 2.5.x updated: KYLIN-3629 NullPointException throws when use preparedStatement cache in some case

[sh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

shaofengshi pushed a commit to branch 2.5.x
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/2.5.x by this push:
     new 70167cf  KYLIN-3629 NullPointException throws when use preparedStatement cache in some case
70167cf is described below

commit 70167cf82772bb3e0aedddde5be3e15c29ac572a
Author: Ma,Gang <ga...@ebay.com>
AuthorDate: Sun Oct 14 10:08:01 2018 +0800

    KYLIN-3629 NullPointException throws when use preparedStatement cache in some case
---
 .../src/main/java/org/apache/kylin/rest/service/QueryService.java      | 3 +++
 1 file changed, 3 insertions(+)

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 6b3b379..5eff1ae 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
@@ -618,6 +618,9 @@ public class QueryService extends BasicService {
 
     private void resetRealizationInContext(OLAPContext olapContext) {
         IRealization realization = olapContext.realization;
+        if (realization == null) {
+            return;
+        }
         KylinConfig config = getConfig();
         HybridInstance hybridInstance = HybridManager.getInstance(config).getHybridInstance(realization.getName());
         if (hybridInstance != null) {