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; + } } }