feat:(1.3.0-beta1.1): 修复上下文值为null 合并异常问题
This commit is contained in:
parent
f35eddc806
commit
f1d2a9b1c2
@ -469,6 +469,10 @@ public class WorkflowBatchHandler {
|
|||||||
|
|
||||||
public static void mergeMaps(Map<String, Object> mainMap, Map<String, Object> waitMergeMap) {
|
public static void mergeMaps(Map<String, Object> mainMap, Map<String, Object> waitMergeMap) {
|
||||||
for (Map.Entry<String, Object> entry : waitMergeMap.entrySet()) {
|
for (Map.Entry<String, Object> entry : waitMergeMap.entrySet()) {
|
||||||
|
if (Objects.isNull(entry.getKey()) || Objects.isNull(entry.getValue())) {
|
||||||
|
SnailJobLog.LOCAL.warn("上下文的key和value不支持NULl");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
mainMap.merge(entry.getKey(), entry.getValue(), (v1, v2) -> v2);
|
mainMap.merge(entry.getKey(), entry.getValue(), (v1, v2) -> v2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user