From 6d080eb3bfddd68d4e66870eac3bea2b836540b5 Mon Sep 17 00:00:00 2001 From: Maxim Valyanskiy Date: Fri, 16 Sep 2011 15:38:50 +0000 Subject: [PATCH] MAPIMessage: fix NPE in set7BitEncoding git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1171628 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/org/apache/poi/hsmf/MAPIMessage.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java b/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java index 91c4c7479..b105c8b4e 100644 --- a/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java +++ b/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java @@ -413,11 +413,15 @@ public class MAPIMessage extends POIDocument { ((StringChunk)c).set7BitEncoding(charset); } } - for(Chunk c : nameIdChunks.getAll()) { - if(c instanceof StringChunk) { - ((StringChunk)c).set7BitEncoding(charset); + + if (nameIdChunks!=null) { + for(Chunk c : nameIdChunks.getAll()) { + if(c instanceof StringChunk) { + ((StringChunk)c).set7BitEncoding(charset); + } } } + for(RecipientChunks rc : recipientChunks) { for(Chunk c : rc.getAll()) { if(c instanceof StringChunk) {