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

8078891: java.io.SequenceInputStream.close is not atomic and not idempotent

Browse source 
Reviewed-by: prappo, dfuchs, alanb
This commit is contained in:
Brian Burkhalter 2019-07-29 09:09:23 -07:00
parent 20ee82bf0a
commit 62c2d1fbd9
2 changed files with 108 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/java.base/share/classes/java/io/SequenceInputStream.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1994, 2019, 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
@ -88,7 +88,7 @@ class SequenceInputStream extends InputStream {
}
/**
* Continues reading in the next stream if an EOF is reached.
* Continues reading in the next stream if an EOF is reached.
*/
final void nextStream() throws IOException {
if (in != null) {
@ -220,8 +220,21 @@ class SequenceInputStream extends InputStream {
* @exception IOException if an I/O error occurs.
*/
public void close() throws IOException {
do {
nextStream();
} while (in != null);
IOException ioe = null;
while (in != null) {
try {
in.close();
} catch (IOException e) {
if (ioe == null) {
ioe = e;
} else {
ioe.addSuppressed(e);
}
}
peekNextStream();
}
if (ioe != null) {
throw ioe;
}
}
}