[kylin] branch master updated: KYLIN-4597 Fix NPE when download diagnosis info for a job

[xxyu]

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

xxyu 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 9e700ab  KYLIN-4597 Fix NPE when download diagnosis info for a job
9e700ab is described below

commit 9e700abf174450be5e37bbb4919ac851ffdab806
Author: Zhichao Zhang <441586...@qq.com>
AuthorDate: Mon Jun 22 23:41:08 2020 +0800

    KYLIN-4597 Fix NPE when download diagnosis info for a job
    
    Problems:
    When download diagnosis info for a job, it throws NPE.
    
    Solutions:
    Don't replace '-' to '' for job id, which will change the value of job id 
and can't find the job.
---
 .../src/main/java/org/apache/kylin/common/util/CliCommandExecutor.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/core-common/src/main/java/org/apache/kylin/common/util/CliCommandExecutor.java
 
b/core-common/src/main/java/org/apache/kylin/common/util/CliCommandExecutor.java
index 74ea1f9..bb08b4c 100644
--- 
a/core-common/src/main/java/org/apache/kylin/common/util/CliCommandExecutor.java
+++ 
b/core-common/src/main/java/org/apache/kylin/common/util/CliCommandExecutor.java
@@ -163,7 +163,7 @@ public class CliCommandExecutor {
         }
     }
 
-    public static final String COMMAND_BLOCK_LIST = "[ 
&`>|{}()$;\\-#~!+*\\\\]+";
+    public static final String COMMAND_BLOCK_LIST = "[ 
&`>|{}()$;\\#~!+*\\\\]+";
     public static final String COMMAND_WHITE_LIST = "[^\\w%,@/:=?.\"\\[\\]]";
     public static final String HIVE_BLOCK_LIST = "[ <>()$;\\-#!+*\"'/=%@]+";