Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
In directory james.mmbase.org:/tmp/cvs-serv14501
Modified Files:
Tag: b1_5
NewsletterPublisher.java
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,allow empty
content email sended
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
See also: http://www.mmbase.org/jira/browse/CMSC-1084
Index: NewsletterPublisher.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java,v
retrieving revision 1.34.2.2
retrieving revision 1.34.2.3
diff -u -b -r1.34.2.2 -r1.34.2.3
--- NewsletterPublisher.java 13 Nov 2008 08:14:09 -0000 1.34.2.2
+++ NewsletterPublisher.java 13 Nov 2008 11:12:46 -0000 1.34.2.3
@@ -51,28 +51,22 @@
public void deliver(Publication publication, Subscription subscription) {
try {
- //if needed to prompt user this validate will be remove to Action
+ // if needed to prompt user this validate will be remove to Action
String originalBody = getBody(publication, subscription);
- if
(!containAticle(publication)||StringUtils.isBlank(HtmlBodyParser.html2text(originalBody)))
{
- log.error("the mail does not contain any aticle, please check your
term or article !");
- return;
- } else {
NewsletterService service = (NewsletterService)
ApplicationContextFactory.getBean("newsletterServices");
// Newsletter newsletter =
service.getNewsletterBySubscription(subscription.getId());
Newsletter newsletter = publication.getNewsletter();
String replyAddress = newsletter.getReplyAddress();
String toEmail = subscription.getEmail();
Message message = new MimeMessage(getMailSession(toEmail,
replyAddress));
- setSenderInfomation(message, newsletter.getFromAddress(),
newsletter.getFromName(), replyAddress,
- newsletter.getReplyName());
+ setSenderInfomation(message, newsletter.getFromAddress(),
newsletter.getFromName(), replyAddress, newsletter
+ .getReplyName());
setContent(message, publication, subscription, originalBody);
setRecipient(message, subscription.getEmail());
// setBody(publication, subscription, message);
setTitle(message, newsletter.getTitle());
// setMIME(message, subscription.getMimeType());
Transport.send(message);
- }
-
log.debug(String.format("mail send! publication %s to %s in %s
format", publication.getId(), subscription
.getId(), subscription.getMimeType()));
} catch (MessagingException e) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
