You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2019/05/20 14:42:40 UTC
svn commit: r1859565 - in /poi/trunk/src/ooxml:
java/org/apache/poi/ooxml/extractor/ExtractorFactory.java
testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java
Author: centic
Date: Mon May 20 14:42:39 2019
New Revision: 1859565
URL: http://svn.apache.org/viewvc?rev=1859565&view=rev
Log:
Include actual found type in exception when encountering unexpected type of file in ExtractorFactory
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/ooxml/extractor/ExtractorFactory.java
poi/trunk/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/ooxml/extractor/ExtractorFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/ooxml/extractor/ExtractorFactory.java?rev=1859565&r1=1859564&r2=1859565&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/ooxml/extractor/ExtractorFactory.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/ooxml/extractor/ExtractorFactory.java Mon May 20 14:42:39 2019
@@ -167,7 +167,7 @@ public final class ExtractorFactory {
case OOXML:
return createExtractor(OPCPackage.open(is));
default:
- throw new IllegalArgumentException("Your InputStream was neither an OLE2 stream, nor an OOXML stream");
+ throw new IllegalArgumentException("Your InputStream was neither an OLE2 stream, nor an OOXML stream, found type: " + fm);
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java?rev=1859565&r1=1859564&r2=1859565&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java Mon May 20 14:42:39 2019
@@ -42,6 +42,7 @@ import org.apache.poi.ooxml.extractor.PO
import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.openxml4j.opc.PackageAccess;
+import org.apache.poi.poifs.filesystem.FileMagic;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.xssf.extractor.XSSFEventBasedExcelExtractor;
import org.apache.poi.xssf.extractor.XSSFExcelExtractor;
@@ -193,6 +194,11 @@ public class TestExtractorFactory {
try (FileInputStream fis = new FileInputStream(txt);
POITextExtractor ignored = poifs.apply(fis)) {
fail("extracting from invalid package");
+ } catch (IllegalArgumentException e) {
+ assertTrue("Had: " + e,
+ e.getMessage().contains(FileMagic.UNKNOWN.name()));
+
+ throw e;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org