Skip to content

Commit 52405a2

Browse files
committed
#449: ignore Outlook mail headers with empty keys
1 parent fa8a897 commit 52405a2

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

modules/outlook-module/src/main/java/org/simplejavamail/internal/outlooksupport/converter/OutlookEmailConverter.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,16 @@ private static EmailFromOutlookMessage buildEmailFromOutlookMessage(
8585
@NotNull final InternalEmailConverter internalEmailConverter) {
8686
checkNonEmptyArgument(builder, "emailBuilder");
8787
checkNonEmptyArgument(outlookMessage, "outlookMessage");
88-
outlookMessage.getHeadersMap()
89-
.forEach((key, value) -> value.forEach(headerValue -> parseHeader(key, MimeUtility.unfold(headerValue), builder)));
88+
outlookMessage.getHeadersMap().entrySet().stream()
89+
.filter(e -> !valueNullOrEmpty(e.getKey()))
90+
.forEach((entry) -> entry.getValue()
91+
.forEach(headerValue -> parseHeader(entry.getKey(), MimeUtility.unfold(headerValue), builder))
92+
);
9093
String fromEmail = ofNullable(outlookMessage.getFromEmail()).orElse("[email protected]");
9194
builder.from(outlookMessage.getFromName(), fromEmail);
9295
builder.fixingMessageId(outlookMessage.getMessageId());
9396
builder.fixingSentDate(ofNullable(outlookMessage.getClientSubmitTime()).orElse(outlookMessage.getDate())); // TODO creation date?
94-
if (!MiscUtil.valueNullOrEmpty(outlookMessage.getReplyToEmail())) {
97+
if (!valueNullOrEmpty(outlookMessage.getReplyToEmail())) {
9598
builder.withReplyTo(outlookMessage.getReplyToName(), outlookMessage.getReplyToEmail());
9699
}
97100
copyReceiversFromOutlookMessage(builder, outlookMessage);

0 commit comments

Comments
 (0)