Author: centic
Date: Sun Jun 2 11:31:31 2024
New Revision: 1918118
URL: http://svn.apache.org/viewvc?rev=1918118&view=rev
Log:
Change one exception to warning-log to avoid regressions in mass-tests
This avoids "breaking" a few documents which could be opened before.
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
poi/trunk/test-data/spreadsheet/stress.xls
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java?rev=1918118&r1=1918117&r2=1918118&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
Sun Jun 2 11:31:31 2024
@@ -19,6 +19,8 @@ package org.apache.poi.hwpf.model;
import java.util.LinkedList;
import java.util.List;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.poi.ddf.DefaultEscherRecordFactory;
import org.apache.poi.ddf.EscherBSERecord;
import org.apache.poi.ddf.EscherBlipRecord;
@@ -33,6 +35,7 @@ import org.apache.poi.util.LittleEndian;
@Internal
public class PICFAndOfficeArtData {
+ private static final Logger LOG =
LogManager.getLogger(PicturesTable.class);
/**
* Can contain either a {@link EscherBlipRecord} or a {@link
EscherBSERecord}.
@@ -89,7 +92,7 @@ public class PICFAndOfficeArtData {
// [MS-ODRAW] allows for multiple records in a
OfficeArtInlineSpContainer, which is what we're parsing here.
// However, in the context of a HWPF document, there should be
only 1.
if (_blipRecords.size() != 1) {
- throw new IllegalStateException("Should only have one
BLIP-Record, but had: " + _blipRecords.size());
+ LOG.atWarn().log("Should only have one BLIP-Record, but had: "
+ _blipRecords.size());
}
}
}
Modified:
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java?rev=1918118&r1=1918117&r2=1918118&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
(original)
+++
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
Sun Jun 2 11:31:31 2024
@@ -61,7 +61,6 @@ public class TestWordToConverterSuite {
"clusterfuzz-testcase-minimized-POIHWPFFuzzer-4947285593948160.doc",
"clusterfuzz-testcase-minimized-POIHWPFFuzzer-5440721166139392.doc",
"clusterfuzz-testcase-minimized-POIHWPFFuzzer-5050208641482752.doc",
- "clusterfuzz-testcase-minimized-POIHWPFFuzzer-4892412469968896.doc",
"clusterfuzz-testcase-minimized-POIHWPFFuzzer-6610789829836800.doc"
);
Modified:
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java?rev=1918118&r1=1918117&r2=1918118&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
(original)
+++
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
Sun Jun 2 11:31:31 2024
@@ -54,7 +54,6 @@ public class TestWordToTextConverter {
"clusterfuzz-testcase-minimized-POIHWPFFuzzer-4947285593948160.doc",
"clusterfuzz-testcase-minimized-POIHWPFFuzzer-5440721166139392.doc",
"clusterfuzz-testcase-minimized-POIHWPFFuzzer-5050208641482752.doc",
- "clusterfuzz-testcase-minimized-POIHWPFFuzzer-4892412469968896.doc",
"clusterfuzz-testcase-minimized-POIHWPFFuzzer-6610789829836800.doc"
);
Modified: poi/trunk/test-data/spreadsheet/stress.xls
URL:
http://svn.apache.org/viewvc/poi/trunk/test-data/spreadsheet/stress.xls?rev=1918118&r1=1918117&r2=1918118&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
