Remove unnecessary From line in body of email
When sendemail.from = USER we don't want an extra From line in the
body of the message that echos the From line of the email.
Bug: issue 475
Change-Id: I0c4d68b0f2951ab899cb0b8123aafb96c54d8c9f
Signed-off-by: Shawn O. Pearce <sop@google.com>
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java
index 39c8e8c..2d739ea 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java
@@ -81,7 +81,7 @@
@Override
public boolean isGenericAddress(Account.Id fromId) {
- return from(fromId) != srvAddr;
+ return false;
}
@Override
@@ -130,13 +130,7 @@
@Override
public boolean isGenericAddress(Account.Id fromId) {
- if (fromId != null) {
- final Account account = accountCache.get(fromId).getAccount();
- final String name = account.getFullName();
- return name == null || "".equals(name);
- } else {
- return true;
- }
+ return false;
}
@Override
