Author: centic
Date: Mon Aug 17 20:54:32 2015
New Revision: 1696338
URL: http://svn.apache.org/r1696338
Log:
Bug 54938: Throw InvalidFormatException as documented instead of
IllegalArgumentException in WorkbookFactory.create()
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/ss/usermodel/WorkbookFactory.java?rev=1696338&r1=1696337&r2=1696338&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
Mon Aug 17 20:54:32 2015
@@ -208,7 +208,7 @@ public class WorkbookFactory {
if (POIXMLDocument.hasOOXMLHeader(inp)) {
return new XSSFWorkbook(OPCPackage.open(inp));
}
- throw new IllegalArgumentException("Your InputStream was neither an
OLE2 stream, nor an OOXML stream");
+ throw new InvalidFormatException("Your InputStream was neither an OLE2
stream, nor an OOXML stream");
}
/**
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java?rev=1696338&r1=1696337&r2=1696338&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
(original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
Mon Aug 17 20:54:32 2015
@@ -30,6 +30,7 @@ import org.apache.poi.ss.usermodel.Workb
import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.apache.poi.util.TempFile;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.openxml4j.opc.OPCPackage;
import junit.framework.TestCase;
@@ -135,7 +136,7 @@ public final class TestWorkbookFactory e
stream.close();
}
fail();
- } catch(IllegalArgumentException e) {
+ } catch(InvalidFormatException e) {
// Good
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
