summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2016-02-03 12:39:42 +0900
committerDavid Pursehouse <david.pursehouse@sonymobile.com>2016-02-03 15:01:38 +0900
commite8f99813a7b0f4e2fa9ac0c48702d26047c4d95b (patch)
tree836383e622b49859e4ca8e2642d249e619ff2df3
parent747850cfbc901befd2d19f42ecd7277106a6248f (diff)
RegisterNewEmailSender: Don't unconditionally send verification mail
If the server configuration includes sendemail.allowrcpt, and the user attempts to register an email address that is not included in the allowed list, OutgoingEmail will skip adding that address to the list of recipients. However, RegisterNewEmailSender overrides the 'shouldSendMessage' method to always return true, which means Gerrit still attempts to send the verification mail which has no recipients. This results in an error from the SMTP server: rejected DATA command: 503 5.5.2 Need rcpt command which in turn results in an "Internal server error" message to the user. Remove the overridden shouldSendMessage method, so that the default implementation (which checks for recipients and content) is used. Change-Id: I4f756f98627447a3f23ecdc9fa82309ba0a0271a
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java
index eb32700c50..c24997bc70 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java
@@ -48,11 +48,6 @@ public class RegisterNewEmailSender extends OutgoingEmail {
}
@Override
- protected boolean shouldSendMessage() {
- return true;
- }
-
- @Override
protected void format() throws EmailException {
appendText(velocifyFile("RegisterNewEmail.vm"));
}