OutgoingEmail#send: Check first if email sending is enabled

Move the check for email sending being disabled to the beginning of
the method. There's no point doing anything else if it's disabled.

Change-Id: I97cf1ed64453067ac9330aaf4216fdb18ea0d5d3

1 files changed, 4 insertions, 4 deletions

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmail.java
index 7420611522..debe684aa1 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmail.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmail.java
@@ -111,16 +111,16 @@ public abstract class OutgoingEmail {
    * @throws EmailException
    */
   public void send() throws EmailException {
-    if (NotifyHandling.NONE.equals(notify) && accountsToNotify.isEmpty()) {
-      return;
-    }
-
     if (!args.emailSender.isEnabled()) {
       // Server has explicitly disabled email sending.
       //
       return;
     }
 
+    if (NotifyHandling.NONE.equals(notify) && accountsToNotify.isEmpty()) {
+      return;
+    }
+
     init();
     if (useHtml()) {
       appendHtml(soyHtmlTemplate("HeaderHtml"));