The Unified and Autonomous Development Platform
fix: Add null check for mail connector in DefaultMailService
Robin Shen88b9bd0ddf3d
diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.javaindex 50308f34ac..6cf9ffa3d2 100644--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailService.java@@ -231,18 +231,22 @@ public class DefaultMailService implements MailService, Serializable {@Nullable String senderName, @Nullable String references) {transactionService.runAfterCommit(() -> {var mailConnector = settingService.getMailConnector();- submitToSendExecutor(mailConnector.getConcurrency(), () -> {- try {- SecurityUtils.bindAsSystem();- sendMail(toList, ccList, bccList, subject, htmlBody, textBody, replyAddress,- senderName, references);- } catch (Exception e) {- var message = String.format(- "Error sending email (to: %s, cc: %s, bcc: %s, subject: %s)",- toList, ccList, bccList, subject);- logger.error(message, e);- }- });+ if (mailConnector != null) {+ submitToSendExecutor(mailConnector.getConcurrency(), () -> {+ try {+ SecurityUtils.bindAsSystem();+ sendMail(toList, ccList, bccList, subject, htmlBody, textBody, replyAddress,+ senderName, references);+ } catch (Exception e) {+ var message = String.format(+ "Error sending email (to: %s, cc: %s, bcc: %s, subject: %s)",+ toList, ccList, bccList, subject);+ logger.error(message, e);+ }+ });+ } else {+ logger.warn("Unable to send mail as mail service is not configured");+ }});}