From def01db5f7dc1c607026528eed1dfd75c6e59779 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 18 Nov 2015 09:19:23 -0500 Subject: [PATCH] Catch some potential NPEs --- src/main/java/com/gitblit/service/MailService.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/service/MailService.java b/src/main/java/com/gitblit/service/MailService.java index ae9727f..ec3a84c 100644 --- a/src/main/java/com/gitblit/service/MailService.java +++ b/src/main/java/com/gitblit/service/MailService.java @@ -37,6 +37,7 @@ import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; +import javax.mail.internet.MimeUtility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -196,7 +197,8 @@ } message.setSentDate(new Date()); - message.setSubject(mailing.subject); + // UTF-8 encode + message.setSubject(MimeUtility.encodeText(mailing.subject, "utf-8", "B")); MimeBodyPart messagePart = new MimeBodyPart(); messagePart.setText(mailing.content, "utf-8"); -- Gitblit v1.9.1