Update of /var/cvs/applications/email/src/org/mmbase/applications/email
In directory 
james.mmbase.org:/tmp/cvs-serv8557/src/org/mmbase/applications/email

Modified Files:
        SendMail.java 
Log Message:
Set a default timeout for sending mail. Also made it configurable


See also: 
http://cvs.mmbase.org/viewcvs/applications/email/src/org/mmbase/applications/email


Index: SendMail.java
===================================================================
RCS file: 
/var/cvs/applications/email/src/org/mmbase/applications/email/SendMail.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- SendMail.java       3 Feb 2008 17:46:28 -0000       1.39
+++ SendMail.java       21 Mar 2008 14:51:45 -0000      1.40
@@ -30,7 +30,7 @@
  * @author Daniel Ockeloen
  * @author Johannes Verelst <[EMAIL PROTECTED]>
  * @since  MMBase-1.6
- * @version $Id: SendMail.java,v 1.39 2008/02/03 17:46:28 nklasens Exp $
+ * @version $Id: SendMail.java,v 1.40 2008/03/21 14:51:45 michiel Exp $
  */
 public class SendMail extends AbstractSendMail {
     private static final Logger log = 
Logging.getLoggerInstance(SendMail.class);
@@ -311,6 +311,14 @@
                 prop.put("mail.transport.protocol", "smtp");
                 prop.put("mail.smtp.starttls.enable","true");
 
+                prop.put("mail.smtp.connectiontimeout", "10000");
+                prop.put("mail.smtp.timeout", "10000");
+
+                for (Map.Entry<String, String> entry : 
getInitParameters().entrySet()) {
+                    if (entry.getKey().startsWith("mail.")) {
+                        prop.put(entry.getKey(), entry.getValue());
+                    }
+                }
                 StringBuilder buf = new StringBuilder(smtpHost);
                 prop.put("mail.smtp.host", smtpHost);
 
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to