pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

try harder to close zipArchive in ZipPackage (edge cases)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1912986 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2023-10-15 21:06:01 +00:00
parent dbddc32c1b
commit edef04dce7
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackage.java
View File

@ -458,22 +458,35 @@ public final class ZipPackage extends OPCPackage {
@Override
protected void closeImpl() throws IOException {
// Flush the package
flush();
try {
flush();
} catch (RuntimeException|Error e) {
IOUtils.closeQuietly(zipArchive);
throw e;
}
if (this.originalPackagePath == null || this.originalPackagePath.isEmpty()) {
IOUtils.closeQuietly(zipArchive);
return;
}
// Save the content
File targetFile = new File(this.originalPackagePath);
if (!targetFile.exists()) {
IOUtils.closeQuietly(zipArchive);
throw new InvalidOperationException(
"Can't close a package not previously open with the open() method !");
}
// Case of a package previously open
String tempFileName = generateTempFileName(FileHelper.getDirectory(targetFile));
File tempFile = TempFile.createTempFile(tempFileName, ".tmp");
File tempFile;
try {
String tempFileName = generateTempFileName(FileHelper.getDirectory(targetFile));
tempFile = TempFile.createTempFile(tempFileName, ".tmp");
} catch (IOException|RuntimeException|Error e) {
IOUtils.closeQuietly(zipArchive);
throw e;
}
// Save the final package to a temporary file
boolean success = false;
@ -482,7 +495,7 @@ public final class ZipPackage extends OPCPackage {
success = true;
} finally {
// Close the current zip file, so we can overwrite it on all platforms
IOUtils.closeQuietly(this.zipArchive);
IOUtils.closeQuietly(zipArchive);
try {
// Copy the new file over the old one if save() succeed
if(success) {