Browse Source

[bug-64045] close resources if we throw exceptions

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1872284 13f79535-47bb-0310-9956-ffa450edef68
tags/REL_4_1_2
PJ Fanning 4 years ago
parent
commit
578d78da37
1 changed files with 3 additions and 1 deletions
  1. 3
    1
      src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java

+ 3
- 1
src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java View File

@@ -759,7 +759,7 @@ public class POIXMLDocumentPart {
/**
* Retrieves the core document part
*
* @since POI 3.14-Beta1
* Since POI 4.1.2 - pkg is closed if this method throws an exception
*/
private static PackagePart getPartFromOPCPackage(OPCPackage pkg, String coreDocumentRel) {
PackageRelationship coreRel = pkg.getRelationshipsByType(coreDocumentRel).getRelationship(0);
@@ -767,6 +767,7 @@ public class POIXMLDocumentPart {
if (coreRel != null) {
PackagePart pp = pkg.getPart(coreRel);
if (pp == null) {
IOUtils.closeQuietly(pkg);
throw new POIXMLException("OOXML file structure broken/invalid - core document '" + coreRel.getTargetURI() + "' not found.");
}
return pp;
@@ -778,6 +779,7 @@ public class POIXMLDocumentPart {
throw new POIXMLException("Strict OOXML isn't currently supported, please see bug #57699");
}

IOUtils.closeQuietly(pkg);
throw new POIXMLException("OOXML file structure broken/invalid - no core document found!");
}
}

Loading…
Cancel
Save