Author: michiel
Date: 2010-05-26 10:22:18 +0200 (Wed, 26 May 2010)
New Revision: 42266
Modified:
mmbase/branches/MMBase-1_9/applications/email/src/main/java/org/mmbase/applications/email/EmailHandler.java
Log:
indentation only
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-05-26 08:21:45 UTC (rev 42265)
+++
mmbase/branches/MMBase-1_9/applications/email/src/main/java/org/mmbase/applications/email/EmailHandler.java
2010-05-26 08:22:18 UTC (rev 42266)
@@ -58,7 +58,7 @@
String body = node.getStringValue("body");
Map<String, String> headers = getHeaders(node);
-
+
boolean mailed = false;
if (toGroup.size() > 0) {
// bulk-mailing
@@ -300,15 +300,18 @@
mailResult = EmailBuilder.getSendMail().sendMail(from,
to.email, body, headers);
} else {
MimeMultipart mmpart =
MimeMessageGenerator.getMimeMultipart(body, node);
- if (mmpart == null) throw new NullPointerException();
+ if (mmpart == null) {
+ throw new NullPointerException();
+ }
mailResult =
EmailBuilder.getSendMail().sendMultiPartMail(from, to.email, headers, mmpart);
}
} catch (MessagingException me) {
+ mailResult = false;
exception = me;
}
if (! mailResult) {
- log.warn("Mail to " + to.email + " failed", exception);
+ log.warn("Mail to " + to.email + " failed", exception);
if (node.getNodeManager().hasField("mailstatus")) {
node.setValue("mailstatus", EmailBuilder.STATE_FAILED);
}
@@ -322,7 +325,9 @@
node.setValue("mailstatus", EmailBuilder.STATE_DELIVERED);
}
}
- if (exception != null) throw exception;
+ if (exception != null) {
+ throw exception;
+ }
return true;
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
