]> source.dussan.org Git - poi.git/commitdiff
Demote the HPSF CodePageString null check from an exception to a Warning, as we seem...
authorNick Burch <nick@apache.org>
Mon, 28 Nov 2011 17:38:29 +0000 (17:38 +0000)
committerNick Burch <nick@apache.org>
Mon, 28 Nov 2011 17:38:29 +0000 (17:38 +0000)
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1207477 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/poi/hpsf/CodePageString.java

index 110961ba67d231c15ae237ede471efb49ea29fe7..a454d6a319d86d28dcbde16f85de2ff9031d4426 100644 (file)
@@ -158,10 +158,16 @@ class CodePageString
         offset += LittleEndian.INT_SIZE;
 
         _value = LittleEndian.getByteArray( data, offset, size );
-        if ( _value[size - 1] != 0 )
-            throw new IllegalPropertySetDataException(
-                    "CodePageString started at offset #" + offset
-                            + " is not NULL-terminated" );
+        if ( _value[size - 1] != 0 ) {
+            // TODO Some files, such as TestVisioWithCodepage.vsd, are currently
+            //  triggering this for values that don't look like codepages
+            // See Bug #52258 for details
+            logger.log(POILogger.WARN, "CodePageString started at offset #" + offset
+                        + " is not NULL-terminated" );
+//            throw new IllegalPropertySetDataException(
+//                    "CodePageString started at offset #" + offset
+//                            + " is not NULL-terminated" );
+        }
     }
 
     CodePageString( String string, int codepage )