Fix potential slow/hanging host resolution when sending mail (fixes #358

)
greenmail-mail-test · Jan 4, 2021 · e1a2e22 · e1a2e22
1 parent 5670467
commit e1a2e22
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/util/ServerSetup.java b/greenmail-core/src/main/java/com/icegreen/greenmail/util/ServerSetup.java
@@ -238,7 +238,12 @@ public Properties configureJavaMailSessionProperties(Properties properties, bool
         // Set local host address (makes tests much faster. If this is not set java mail always looks for the address)
         props.setProperty(MAIL_DOT + getProtocol() + ".localaddress", ServerSetup.getLocalHostAddress());
         props.setProperty(MAIL_DOT + getProtocol() + ".port", String.valueOf(getPort()));
-        props.setProperty(MAIL_DOT + getProtocol() + ".host", String.valueOf(getBindAddress()));
+        final String bindAddress = getBindAddress();
+        props.setProperty(MAIL_DOT + getProtocol() + ".host", String.valueOf(bindAddress));
+        // Fixes slow Transport.send->UniqueValue.getUniqueMessageIDValue->javax.mail.internet.InternetAddress.getLocalAddress
+        if(!props.containsKey("mail.host")&&null!=bindAddress) {
+            props.setProperty("mail.host", bindAddress);
+        }
 
         if (isSecure()) {
             props.put(MAIL_DOT + getProtocol() + ".starttls.enable", Boolean.TRUE);