Author: fanningpj
Date: Tue Jan 7 18:46:11 2020
New Revision: 1872453
URL: http://svn.apache.org/viewvc?rev=1872453&view=rev
Log:
close OPCPackage if there is an exception
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java?rev=1872453&r1=1872452&r2=1872453&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
Tue Jan 7 18:46:11 2020
@@ -301,7 +301,7 @@ public class XSSFWorkbook extends POIXML
* OPCPackage pkg = OPCPackage.open(path);
* XSSFWorkbook wb = new XSSFWorkbook(pkg);
* // work with the wb object
- * ......
+ * ......XWPFDocument
* pkg.close(); // gracefully closes the underlying zip file
* </code></pre>
*/
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java?rev=1872453&r1=1872452&r2=1872453&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
Tue Jan 7 18:46:11 2020
@@ -154,8 +154,9 @@ public class XWPFDocument extends POIXML
* Create a new WordProcessingML package and setup the default minimal
content
*/
protected static OPCPackage newPackage() {
+ OPCPackage pkg = null;
try {
- OPCPackage pkg = OPCPackage.create(new ByteArrayOutputStream());
// NOSONAR - we do not want to close this here
+ pkg = OPCPackage.create(new ByteArrayOutputStream()); //
NOSONAR - we do not want to close this here
// Main part
PackagePartName corePartName =
PackagingURIHelper.createPartName(XWPFRelation.DOCUMENT.getDefaultFileName());
// Create main part relationship
@@ -167,6 +168,7 @@ public class XWPFDocument extends POIXML
return pkg;
} catch (Exception e) {
+ IOUtils.closeQuietly(pkg);
throw new POIXMLException(e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
