From fb52207cfa7d6f290d29e7dfaaae18610f459aaa Mon Sep 17 00:00:00 2001
From: fuchanghai <33984497+fuchanghai@users.noreply.github.com>
Date: Mon, 11 Sep 2023 08:51:58 +0800
Subject: [PATCH] [cherry-pick] Construct processInstance may NPE when master
 handling command (#14888)

---
 .../dolphinscheduler/service/process/ProcessServiceImpl.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
index 93fc7e2490..7d4fb06ce9 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
@@ -927,6 +927,9 @@ public class ProcessServiceImpl implements ProcessService {
             throw new IllegalArgumentException("Cannot find the process definition for this workflowInstance");
         }
         Map<String, String> cmdParam = JSONUtils.toMap(command.getCommandParam());
+        if(cmdParam == null){
+            cmdParam = new HashMap<>();
+        }
         int processInstanceId = command.getProcessInstanceId();
         if (processInstanceId == 0) {
             processInstance = generateNewProcessInstance(processDefinition, command, cmdParam);