opendev/gerrit
Code Issues Proposed changes

Merge "Don't remove fromUser email from From header"

Browse Source
This commit is contained in:
Edwin Kempin
2016-04-11 06:12:57 +00:00
committed by Gerrit Code Review
parent 87bc80ef66 a79f693ccc
commit b50cd86eff
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java
View File

@@ -494,9 +494,10 @@ public abstract class OutgoingEmail {
j.remove(); j.remove();
} }
} }
for (EmailHeader hdr : headers.values()) { for (Map.Entry<String, EmailHeader> entry : headers.entrySet()) {
if (hdr instanceof AddressList) { // Don't remove fromEmail from the "From" header though!
((AddressList) hdr).remove(fromEmail); if (entry.getValue() instanceof AddressList && entry.getKey() != "From") {
((AddressList) entry.getValue()).remove(fromEmail);
} }
} }
} }