From dc1c4d025595e8db8d3e9b02b603bcdb9b3eb641 Mon Sep 17 00:00:00 2001
From: baoliang <baoliang@analysys.com.cn>
Date: Fri, 24 May 2019 14:35:25 +0800
Subject: [PATCH] fix bug: cannot delete global_params field when updating
 definition

---
 .../cn/escheduler/api/service/ProcessDefinitionService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java
index 7b20f516db..b83d474679 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java
@@ -293,12 +293,12 @@ public class ProcessDefinitionService extends BaseDAGService {
         processDefine.setTimeout(processData.getTimeout());
 
         //custom global params
-        List<Property> globalParamsList = processData.getGlobalParams();
-        if (globalParamsList != null && globalParamsList.size() > 0) {
+        List<Property> globalParamsList = new ArrayList<>();
+        if (processData.getGlobalParams() != null && processData.getGlobalParams().size() > 0) {
             Set<Property> userDefParamsSet = new HashSet<>(globalParamsList);
             globalParamsList = new ArrayList<>(userDefParamsSet);
-            processDefine.setGlobalParamList(globalParamsList);
         }
+        processDefine.setGlobalParamList(globalParamsList);
         processDefine.setUpdateTime(now);
         processDefine.setFlag(Flag.YES);
         if (processDefineMapper.update(processDefine) > 0) {