Skip to content

IOException while sending message FMSG-49 #resolve #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 25, 2018
Merged

IOException while sending message FMSG-49 #resolve #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...ispatch/src/main/java/org/fenixedu/messaging/emaildispatch/domain/MimeMessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
import org.fenixedu.messaging.emaildispatch.EmailDispatchConfiguration.ConfigurationProperties;
import org.joda.time.DateTime;

import com.google.common.base.Strings;
import com.google.common.collect.Lists;

import org.springframework.util.StringUtils;
import pt.ist.fenixframework.Atomic;
import pt.ist.fenixframework.Atomic.TxMode;

Expand Down Expand Up @@ -113,7 +113,7 @@ protected void updateMessageID() throws MessagingException {
mimeMessage.setSubject(getContent(message.getSubject(), locale));

final String replyTo = message.getReplyTo();
if (StringUtils.hasText(replyTo)) {
if (!Strings.isNullOrEmpty(replyTo)) {
Address[] replyTos = { new InternetAddress(replyTo) };
mimeMessage.setReplyTo(replyTos);
}
Expand All @@ -126,14 +126,14 @@ protected void updateMessageID() throws MessagingException {

// Should be ordered "plainest to richest" (first: text/plain | second: text/html) to display properly in email clients
final String textBody = getContent(message.getTextBody(), locale);
if (StringUtils.hasText(textBody)) {
if (!Strings.isNullOrEmpty(textBody)) {
final BodyPart bodyPart = new MimeBodyPart();
bodyPart.setText(textBody);
bodyPart.setContent(textBody, "text/plain; charset=utf-8");
htmlAndTextMultipart.addBodyPart(bodyPart);
}

final String htmlBody = getContent(message.getHtmlBody(), locale);
if (StringUtils.hasText(htmlBody)) {
if (!Strings.isNullOrEmpty(htmlBody)) {
final BodyPart bodyPart = new MimeBodyPart();
bodyPart.setContent(htmlBody, "text/html; charset=utf-8");
htmlAndTextMultipart.addBodyPart(bodyPart);
Expand Down