opendev/gerrit
Code Issues Proposed changes

Don't bother setting Message-ID to a random string.

Browse Source 
If the Message-ID is not set to a specific regenerable string,
don't bother to set it since the smtp server will add the
header for us.
This commit is contained in:
Martin Fick
2010-07-22 14:20:57 -06:00
parent 95a0d8c9cc
commit df89f998d5
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,6 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.TreeSet;
@@ -63,7 +62,6 @@ public abstract class OutgoingEmail {
private static final String HDR_TO = "To";
private static final String HDR_CC = "CC";
private static final Random RNG = new Random();
protected String messageClass;
private final HashSet<Account.Id> rcptTo = new HashSet<Account.Id>();
private final Map<String, EmailHeader> headers;
@@ -131,18 +129,6 @@ public abstract class OutgoingEmail {
}
}
if (headers.get("Message-ID").isEmpty()) {
final StringBuilder rndid = new StringBuilder();
rndid.append("<");
rndid.append(System.currentTimeMillis());
rndid.append("-");
rndid.append(Integer.toString(RNG.nextInt(999999), 36));
rndid.append("@");
rndid.append(SystemReader.getInstance().getHostname());
rndid.append(">");
setHeader("Message-ID", rndid.toString());
}
args.emailSender.send(smtpFromAddress, smtpRcptTo, headers, body.toString());
}
}