Update of /var/cvs/applications/email/src/org/mmbase/applications/email
In directory james.mmbase.org:/tmp/cvs-serv14826/applications/email
Modified Files:
SendMail.java
Log Message:
hff
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.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- SendMail.java 27 Oct 2008 12:20:10 -0000 1.52
+++ SendMail.java 27 Oct 2008 12:48:05 -0000 1.53
@@ -32,7 +32,7 @@
* @author Daniel Ockeloen
* @author Johannes Verelst <[EMAIL PROTECTED]>
* @since MMBase-1.6
- * @version $Id: SendMail.java,v 1.52 2008/10/27 12:20:10 michiel Exp $
+ * @version $Id: SendMail.java,v 1.53 2008/10/27 12:48:05 michiel Exp $
*/
public class SendMail extends AbstractSendMail {
private static final Logger log =
Logging.getLoggerInstance(SendMail.class);
@@ -210,10 +210,12 @@
log.debug("Finished processing local mails");
}
+ private static final InternetAddress[] EMPTY = new InternetAddress[] {};
/**
* Like InternetAddress#parse but leaves out the addresses not matching
'onlyTo'.
*/
protected InternetAddress[] parseOnly(String to) throws MessagingException
{
+ if (to != null && ! "".equals(to)) {
List<InternetAddress> res = new ArrayList<InternetAddress>();
InternetAddress[] parsed = InternetAddress.parse(to);
for( InternetAddress a : parsed) {
@@ -224,7 +226,11 @@
}
}
- return res.toArray(parsed);
+ return res.toArray(EMPTY);
+ } else {
+ return EMPTY;
+ }
+
}
@@ -400,12 +406,12 @@
String cc = headers.get("CC");
if (cc != null) {
- log.info("Adding cc " + cc);
+ log.debug("Adding cc " + cc);
msg.addRecipients(Message.RecipientType.CC, parseOnly(cc));
}
String bcc = headers.get("BCC");
if (bcc != null) {
- log.info("Adding bcc " + cc);
+ log.debug("Adding bcc " + bcc);
msg.addRecipients(Message.RecipientType.BCC, parseOnly(bcc));
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs