Author: andre
Date: 2010-02-08 10:08:18 +0100 (Mon, 08 Feb 2010)
New Revision: 40885
Modified:
mmbase/branches/MMBase-1_9/applications/email/src/main/java/org/mmbase/applications/email/AbstractSendMail.java
mmbase/branches/MMBase-1_9/applications/email/src/main/java/org/mmbase/applications/email/EmailHandler.java
Log:
adding debug to find out about MMB-1925, and should mailedtime not be set like
a date?
Modified:
mmbase/branches/MMBase-1_9/applications/email/src/main/java/org/mmbase/applications/email/AbstractSendMail.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/email/src/main/java/org/mmbase/applications/email/AbstractSendMail.java
2010-02-08 08:52:39 UTC (rev 40884)
+++
mmbase/branches/MMBase-1_9/applications/email/src/main/java/org/mmbase/applications/email/AbstractSendMail.java
2010-02-08 09:08:18 UTC (rev 40885)
@@ -12,7 +12,7 @@
import org.mmbase.module.*;
import org.mmbase.util.*;
import java.util.*;
-import javax.mail.internet.*;
+import javax.mail.internet.MimeMultipart;
/**
* This module provides mail functionality
@@ -50,7 +50,6 @@
* Sends a 'multipart' mail.
*
*/
-
public abstract boolean sendMultiPartMail(String from, String to,
Map<String, String> headers, MimeMultipart mmpart) throws
javax.mail.MessagingException;
Modified:
mmbase/branches/MMBase-1_9/applications/email/src/main/java/org/mmbase/applications/email/EmailHandler.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/email/src/main/java/org/mmbase/applications/email/EmailHandler.java
2010-02-08 08:52:39 UTC (rev 40884)
+++
mmbase/branches/MMBase-1_9/applications/email/src/main/java/org/mmbase/applications/email/EmailHandler.java
2010-02-08 09:08:18 UTC (rev 40885)
@@ -58,7 +58,8 @@
String body = node.getStringValue("body");
Map<String, String> headers = getHeaders(node);
-
+
+ boolean mailed = false;
if (toGroup.size() > 0) {
// bulk-mailing
Set<NodeRecipient> toUsers = new
LinkedHashSet<NodeRecipient>(getTo(node));
@@ -68,6 +69,8 @@
for (NodeRecipient to : toUsers) {
if (! sendMail(node, from, to, body, headers,
messageFormatArguments)) {
success = false;
+ } else {
+ mailed = true;
}
// make sure that CC and BCC are only on first mail, otherwise
those poor people get a lot of mail.
@@ -77,16 +80,19 @@
} else {
// one simple mail
NodeRecipient to = new NodeRecipient(-1,
node.getStringValue("to"));
- sendMail(node, from, to, body, headers, messageFormatArguments);
+ mailed = sendMail(node, from, to, body, headers,
messageFormatArguments);
}
// set the new mailedtime, that can be used by admins
// to see when it was mailed vs the requested mail
// time
- node.setValue("mailedtime", (int)(System.currentTimeMillis()/1000));
+ //node.setValue("mailedtime", (int)(System.currentTimeMillis()/1000));
+ node.setDateValue("mailedtime", new Date());
+ log.debug("Mail send? : " + mailed);
// commit the changes to the cloud
if (! node.isNew()) {
node.commit();
+ log.debug("node.commit() ...");
}
return node;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
