From d383ed9be4c2cb3fec40b5ccb49a6c5ce85d6070 Mon Sep 17 00:00:00 2001 From: wodeyangzipingpingwuqi Date: Fri, 17 May 2024 16:00:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(sj=5Fbeta2):=201=E3=80=81=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E9=87=8D=E8=AF=95=E7=BB=84=E4=BB=B6=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/common/cache/GroupVersionCache.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/cache/GroupVersionCache.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/cache/GroupVersionCache.java index a8649911..8f053c73 100644 --- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/cache/GroupVersionCache.java +++ b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/cache/GroupVersionCache.java @@ -4,6 +4,7 @@ import com.aizuda.snailjob.common.core.constant.SystemConstants; import com.aizuda.snailjob.server.model.dto.ConfigDTO; import org.springframework.util.CollectionUtils; +import java.util.Collections; import java.util.List; import java.util.Objects; @@ -49,9 +50,11 @@ public final class GroupVersionCache { public static ConfigDTO.Notify getRetryNotifyAttribute(Integer notifyScene) { List notifyList = CONFIG.getNotifyList(); - for (ConfigDTO.Notify notify : notifyList) { - if (notify.getRetryNotifyScene().equals(notifyScene)) { - return notify; + if (!CollectionUtils.isEmpty(notifyList)) { + for (ConfigDTO.Notify notify : notifyList) { + if (Objects.nonNull(notify.getRetryNotifyScene()) && notify.getRetryNotifyScene().equals(notifyScene)) { + return notify; + } } } @@ -61,9 +64,11 @@ public final class GroupVersionCache { public static ConfigDTO.Notify getJobNotifyAttribute(Integer notifyScene) { List notifyList = CONFIG.getNotifyList(); - for (ConfigDTO.Notify notify : notifyList) { - if (notify.getJobNotifyScene().equals(notifyScene)) { - return notify; + if (!CollectionUtils.isEmpty(notifyList)) { + for (ConfigDTO.Notify notify : notifyList) { + if (Objects.nonNull(notify.getJobNotifyScene()) && notify.getJobNotifyScene().equals(notifyScene)) { + return notify; + } } }