Fix bug #52664 - MAPIMessage may not always have name chunks when checking for 7...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1244449 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 0d5075e90d55ed8b5356bb192448f624e73fd2c3..665a6cb18b4360086af4bf38e09366f58a3290e1 100644 (file)
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -34,6 +34,7 @@
 
     <changes>
         <release version="3.8-beta6" date="2012-??-??">
+           <action dev="poi-developers" type="fix">52664 - MAPIMessage may not always have name chunks when checking for 7 bit encodings</action>
            <action dev="poi-developers" type="fix">52649 - fixed namespace issue in WordToFoConverter</action>
            <action dev="poi-developers" type="fix">52385 - avoid trancated array and vector data when reading OLE properties</action>
            <action dev="poi-developers" type="fix">52662 - CharacterRun NPE fix when fetching symbol fonts, where no fonts are defined</action>

diff --git a/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java b/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
index 570bc6d6255e47c2c2c08f9b87122dc47a28a6fa..7c600e70145ebbf1388c008fb60ca33f4f1e3d17 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
+++ b/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
@@ -451,13 +451,17 @@ public class MAPIMessage extends POIDocument {
             }
          }
       }
-      for(Chunk c : nameIdChunks.getAll()) {
-         if(c instanceof StringChunk) {
-            if( ((StringChunk)c).getType() == Types.ASCII_STRING ) {
-               return true;
+      
+      if (nameIdChunks!=null) {
+         for(Chunk c : nameIdChunks.getAll()) {
+            if(c instanceof StringChunk) {
+               if( ((StringChunk)c).getType() == Types.ASCII_STRING ) {
+                  return true;
+               }
             }
          }
       }
+      
       for(RecipientChunks rc : recipientChunks) {
          for(Chunk c : rc.getAll()) {
             if(c instanceof StringChunk) {