From 28ec7e434e0c45c9b24848c30f6970d9264c625b Mon Sep 17 00:00:00 2001 From: Eamonn McManus Date: Sun, 19 Feb 2017 19:42:04 -0800 Subject: [PATCH] Prepare for a forthcoming change in AutoValue. Calling setFoo(null) will soon throw a NullPointerException immediately. Previously it would only throw at build() time, and then only if a non-null value had not been set in between. Change-Id: I4dcbaad5b0cb7776852d97c657a8dc7abcf42be9 --- .../google/gerrit/server/mail/receive/RawMailParser.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java index e2f05dc85d..3e45e02516 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java @@ -61,8 +61,12 @@ public class RawMailParser { throw new MailParsingException("Can't parse email", e); } // Add general headers - messageBuilder.id(mimeMessage.getMessageId()); - messageBuilder.subject(mimeMessage.getSubject()); + if (mimeMessage.getMessageId() != null) { + messageBuilder.id(mimeMessage.getMessageId()); + } + if (mimeMessage.getSubject() != null) { + messageBuilder.subject(mimeMessage.getSubject()); + } messageBuilder.dateReceived(new DateTime(mimeMessage.getDate())); // Add From, To and Cc