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

[shaofengshi]

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

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


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

commit ec101142ad01b28b2a6156715f5e2cc6bb042fe3
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 9e6b4af..df0f0a7 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
@@ -619,6 +619,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) {