Changeset 738:b602f977d4a6

Timestamp:

10/12/09 13:07:02 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@739

Message:

added logger
+email address validity check

Files:

• src/org/w3c/unicorn/util/Mail.java (modified) (5 diffs)

src/org/w3c/unicorn/util/Mail.java

@@ -1 @@
-// $Id: Mail.java,v 1.3 2009-10-09 11:13:10 tgambet Exp $
+// $Id: Mail.java,v 1.4 2009-10-12 13:07:02 tgambet Exp $
 // Author: Thomas Gambet
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2009.
@@ -14 +14 @@
 import java.util.Properties;
 
-import javax.mail.Address;
 import javax.mail.Authenticator;
 import javax.mail.MessagingException;
 import javax.mail.Session;
 import javax.mail.Transport;
+import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeBodyPart;
@@ -24 +24 @@
 import javax.mail.internet.MimeMultipart;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.w3c.unicorn.exceptions.UnicornException;
 import org.w3c.unicorn.output.FileOutputFormater;
@@ -30 +32 @@
 public class Mail {
 
+        private static Log logger = LogFactory.getLog(Mail.class);
+        
         public void sendMail(String[] recipients, String subject, List<OutputFormater> outputFormaters, Map<String, Object> contextObjects) throws UnicornException {
                 
@@ -47 +51 @@
                         msg.setFrom(addressFrom);
 
-                        Address[] recipientAdresses = new Address[recipients.length];
+                        List<InternetAddress> validAddresses = new ArrayList<InternetAddress>();
+                        
+                        for (String recipient : recipients) {
+                                try {
+                                        InternetAddress address = new InternetAddress(recipient);
+                                        validAddresses.add(address);
+                                } catch(AddressException e) {
+                                        logger.warn("Invalid address: \"" + recipient + "\". Skipping.");
+                                }
+                        }
+                        
+                        InternetAddress[] recipientsAddresses = new InternetAddress[validAddresses.size()];
                         int i = 0;
-                        for (String recipient : recipients) {
-                                recipientAdresses[i] = new InternetAddress(recipient);
+                        for (InternetAddress add : validAddresses) {
+                                recipientsAddresses[i] = add;
                                 i++;
                         }
-                        msg.setRecipients(javax.mail.Message.RecipientType.TO, recipientAdresses);
+                        
+                        msg.setRecipients(javax.mail.Message.RecipientType.TO, recipientsAddresses);
                         msg.setSubject(subject);