Merge remote-tracking branch 'upstream/dev' into dev

5 years ago · bcd1d584fa
1 changed files with 6 additions and 2 deletions
--- a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java
+++ b/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java
@ -104,6 +104,10 @@ public class MailUtils {
        Map<String,Object> retMap = new HashMap<>();
        retMap.put(Constants.STATUS, false);
        
+        // if there is no receivers && no receiversCc, no need to process
+        if (CollectionUtils.isEmpty(receivers) && CollectionUtils.isEmpty(receiversCc)) {
+            return retMap;
+        }

        receivers.removeIf((from) -> (StringUtils.isEmpty(from)));