diff options
| author | Shawn O. Pearce <sop@google.com> | 2010-03-10 11:17:00 -0800 |
|---|---|---|
| committer | Shawn O. Pearce <sop@google.com> | 2010-03-10 11:25:45 -0800 |
| commit | 60cd31bce7f7846c156becf321e945eb08c65f45 (patch) | |
| tree | a89e5d1fd9aa0544cccf2b6613c5d69285ee026c | |
| parent | 2b4eef576bcfe88ed100d59a42d0870367e332f4 (diff) | |
Remove unnecessary From line in body of emailv2.1.2
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>
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java | 10 |
1 files changed, 2 insertions, 8 deletions
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 39c8e8ce7f..2d739ea1aa 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 @@ public class FromAddressGeneratorProvider implements @Override public boolean isGenericAddress(Account.Id fromId) { - return from(fromId) != srvAddr; + return false; } @Override @@ -130,13 +130,7 @@ public class FromAddressGeneratorProvider implements @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 |