From 2714cb1e6d408fd7f108733507ccef3ffc16af22 Mon Sep 17 00:00:00 2001 From: Baoqi Date: Thu, 11 Apr 2019 16:55:34 +0800 Subject: [PATCH] before send mail, check whether no receivers && cc receivers. to avoid exception javax.mail.SendFailedException: No recipient addresses. Especially from SQL Task --- .../main/java/cn/escheduler/alert/utils/MailUtils.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java b/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java index 42fbebd2f2..3675d4c919 100644 --- a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java +++ b/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java @@ -102,11 +102,16 @@ public class MailUtils { */ public static Map sendMails(Collection receivers, Collection receiversCc, String title, String content, ShowType showType) { Map retMap = new HashMap<>(); - retMap.put(Constants.STATUS, false); - receivers.removeIf((from) -> (StringUtils.isEmpty(from))); + // if there is no receivers && no receiversCc, no need to process + if (CollectionUtils.isEmpty(receivers) && CollectionUtils.isEmpty(receiversCc)) { + retMap.put(Constants.STATUS, true); + return retMap; + } + + retMap.put(Constants.STATUS, false); if (showType == ShowType.TABLE || showType == ShowType.TEXT){ // send email HtmlEmail email = new HtmlEmail();