[kylin] branch master updated: minor, fix NPE

[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 4fb7eee  minor, fix NPE
4fb7eee is described below

commit 4fb7eeec2f16896d85f63eeef903b22fe99ddbdf
Author: shaofengshi <shaofeng...@apache.org>
AuthorDate: Mon Feb 11 11:51:17 2019 +0800

    minor, fix NPE
---
 .../java/org/apache/kylin/rest/controller/ProjectController.java    | 6 +++++-
 .../main/java/org/apache/kylin/rest/metrics/QueryMetricsFacade.java | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/server-base/src/main/java/org/apache/kylin/rest/controller/ProjectController.java
 
b/server-base/src/main/java/org/apache/kylin/rest/controller/ProjectController.java
index 26ea52f..880c09a 100644
--- 
a/server-base/src/main/java/org/apache/kylin/rest/controller/ProjectController.java
+++ 
b/server-base/src/main/java/org/apache/kylin/rest/controller/ProjectController.java
@@ -193,7 +193,11 @@ public class ProjectController extends BasicController {
         try {
 
             ProjectInstance project = 
projectService.getProjectManager().getProject(projectName);
-            projectService.deleteProject(projectName, project);
+            if (project != null) {
+                projectService.deleteProject(projectName, project);
+            } else {
+                logger.info("Project {} not exists", projectName);
+            }
         } catch (Exception e) {
             logger.error(e.getLocalizedMessage(), e);
             throw new InternalErrorException("Failed to delete project. " + " 
Caused by: " + e.getMessage(), e);
diff --git 
a/server-base/src/main/java/org/apache/kylin/rest/metrics/QueryMetricsFacade.java
 
b/server-base/src/main/java/org/apache/kylin/rest/metrics/QueryMetricsFacade.java
index 6b99bee..17ad74d 100644
--- 
a/server-base/src/main/java/org/apache/kylin/rest/metrics/QueryMetricsFacade.java
+++ 
b/server-base/src/main/java/org/apache/kylin/rest/metrics/QueryMetricsFacade.java
@@ -145,7 +145,8 @@ public class QueryMetricsFacade {
                 }
             }
             setQueryStats(queryMetricsEvent, //
-                    sqlResponse.getDuration(), 
sqlResponse.getResults().size(), totalStorageReturnCount);
+                    sqlResponse.getDuration(), sqlResponse.getResults() == 
null ? 0 : sqlResponse.getResults().size(),
+                    totalStorageReturnCount);
             //For update query level metrics
             MetricsManager.getInstance().update(queryMetricsEvent);
         }