archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8313739: ZipOutputStream.close() should always close the wrapped stream

Browse source 
Reviewed-by: jpai, lancea
This commit is contained in:
Eirik Bjørsnøs 2024-02-02 20:20:36 +00:00
parent adc3604027
commit f613e13397
2 changed files with 281 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -240,14 +240,30 @@ public class DeflaterOutputStream extends FilterOutputStream {
*/
public void close() throws IOException {
if (!closed) {
closed = true;
IOException finishException = null;
try {
finish();
} catch (IOException ioe){
finishException = ioe;
throw ioe;
} finally {
if (usesDefaultDeflater)
if (usesDefaultDeflater) {
def.end();
}
if (finishException == null) {
out.close();
} else {
try {
out.close();
} catch (IOException ioe) {
if (finishException != ioe) {
ioe.addSuppressed(finishException);
}
throw ioe;
}
}
}
out.close();
closed = true;
}
}