JAMES-1854 Use Strings for Sieve Message failure notification composition
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/da6d92ee Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/da6d92ee Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/da6d92ee Branch: refs/heads/master Commit: da6d92eeea09df2cbedca96140a3a99c075bbcd4 Parents: dfb09fe Author: Benoit Tellier <[email protected]> Authored: Fri Nov 18 13:08:45 2016 +0700 Committer: Benoit Tellier <[email protected]> Committed: Wed Nov 23 18:19:30 2016 +0700 ---------------------------------------------------------------------- .../mailets/jsieve/delivery/SieveFailureMessageComposer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/da6d92ee/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveFailureMessageComposer.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveFailureMessageComposer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveFailureMessageComposer.java index ba22dfe..7720792 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveFailureMessageComposer.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveFailureMessageComposer.java @@ -26,6 +26,8 @@ import javax.mail.internet.MimeMultipart; import org.apache.mailet.Mail; +import com.google.common.base.Strings; + public class SieveFailureMessageComposer { public static MimeMessage composeMessage(Mail aMail, Exception ex, String user) throws MessagingException { @@ -40,7 +42,7 @@ public class SieveFailureMessageComposer { MimeBodyPart originalPart = new MimeBodyPart(); originalPart.setContent(originalMessage, "message/rfc822"); - if ((originalMessage.getSubject() != null) && (!originalMessage.getSubject().trim().isEmpty())) { + if (Strings.isNullOrEmpty(originalMessage.getSubject())) { originalPart.setFileName(originalMessage.getSubject().trim()); } else { originalPart.setFileName("No Subject"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
