Optimize EmailNotificationChannel when SMTP is not configured

No need to load emails of recipients from database if SMTP server
is not configured.

diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/notification/email/EmailNotificationChannel.java b/server/sonar-server-common/src/main/java/org/sonar/server/notification/email/EmailNotificationChannel.java
index 87235eecceb3121a9c3784e601f64326a719496e..d9e68931ceaa6099151228261bb1c8c0fd73d7f6 100644 (file)
--- a/server/sonar-server-common/src/main/java/org/sonar/server/notification/email/EmailNotificationChannel.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/notification/email/EmailNotificationChannel.java
@@ -96,11 +96,17 @@ public class EmailNotificationChannel extends NotificationChannel {
 
   @Override
   public boolean deliver(Notification notification, String username) {
+    if (StringUtils.isBlank(configuration.getSmtpHost())) {
+      LOG.debug("SMTP host was not configured - email will not be sent");
+      return false;
+    }
+
     User user = findByLogin(username);
     if (user == null || StringUtils.isBlank(user.email())) {
       LOG.debug("User does not exist or has no email: {}", username);
       return false;
     }
+
     EmailMessage emailMessage = format(notification);
     if (emailMessage != null) {
       emailMessage.setTo(user.email());