[dolphinscheduler] branch dev updated: [DS-6502][MasterServer] fix cmdParam NPE when constructProcessInstance on SCHEDULER mode (#6504)

[kerwin]

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

kerwin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new fea7874  [DS-6502][MasterServer] fix cmdParam NPE when 
constructProcessInstance on SCHEDULER mode (#6504)
fea7874 is described below

commit fea7874f95028325f52300949295260cafab4a64
Author: wind <caishunf...@users.noreply.github.com>
AuthorDate: Tue Oct 12 14:42:49 2021 +0800

    [DS-6502][MasterServer] fix cmdParam NPE when constructProcessInstance on 
SCHEDULER mode (#6504)
    
    Co-authored-by: caishunfeng <534328...@qq.com>
---
 .../org/apache/dolphinscheduler/service/process/ProcessService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
 
b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
index 8100d9f..27443fd 100644
--- 
a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
+++ 
b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@ -792,7 +792,7 @@ public class ProcessService {
             }
         }
         // reset command parameter if sub process
-        if (cmdParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS)) {
+        if (cmdParam != null && 
cmdParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS)) {
             processInstance.setCommandParam(command.getCommandParam());
         }
         if (Boolean.FALSE.equals(checkCmdParam(command, cmdParam))) {