This is an automated email from the ASF dual-hosted git repository.
caishunfeng 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 fa906e7 [Fix-7753][Master] Failed to pass global parameters between
parent and sub process (#7755)
fa906e7 is described below
commit fa906e7d01ac5e4222bc068bd1e908297cfd7b57
Author: xiangzihao <[email protected]>
AuthorDate: Sat Jan 1 15:23:50 2022 +0800
[Fix-7753][Master] Failed to pass global parameters between parent and sub
process (#7755)
* fix bug_7753
* fix bug_7753
* fix bug_7753
Co-authored-by: SbloodyS <[email protected]>
---
.../org/apache/dolphinscheduler/service/process/ProcessService.java | 3 ++-
1 file changed, 2 insertions(+), 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 1bc7961..a65f05b 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
@@ -1062,7 +1062,8 @@ public class ProcessService {
List<Property> parentPropertyList =
JSONUtils.toList(parentGlobalParams, Property.class);
List<Property> subPropertyList = JSONUtils.toList(subGlobalParams,
Property.class);
-
+ subPropertyList = new ArrayList<>(subPropertyList);
+
Map<String, String> subMap =
subPropertyList.stream().collect(Collectors.toMap(Property::getProp,
Property::getValue));
for (Property parent : parentPropertyList) {