diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java index 0f23412e..bcabf6fd 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java @@ -469,6 +469,10 @@ public class WorkflowBatchHandler { public static void mergeMaps(Map mainMap, Map waitMergeMap) { for (Map.Entry 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); } }