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

8220477: Channels.newWriter() does not close if underlying channel throws an IOException

Browse source 
Reviewed-by: alanb
This commit is contained in:
Brian Burkhalter 2019-04-17 08:12:19 -07:00
parent 7b7f9a6fd3
commit 69ca2e9e27
3 changed files with 142 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/java.base/share/classes/sun/nio/cs/StreamDecoder.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 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
@ -28,10 +28,20 @@
package sun.nio.cs;
import java.io.*;
import java.nio.*;
import java.nio.channels.*;
import java.nio.charset.*;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.io.Reader;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.channels.FileChannel;
import java.nio.channels.ReadableByteChannel;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CoderResult;
import java.nio.charset.CodingErrorAction;
import java.nio.charset.IllegalCharsetNameException;
public class StreamDecoder extends Reader
{
@ -190,8 +200,11 @@ public class StreamDecoder extends Reader
synchronized (lock) {
if (closed)
return;
implClose();
closed = true;
try {
implClose();
} finally {
closed = true;
}
}
}

38
src/java.base/share/classes/sun/nio/cs/StreamEncoder.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 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
@ -23,15 +23,21 @@
* questions.
*/
/*
*/
package sun.nio.cs;
import java.io.*;
import java.nio.*;
import java.nio.channels.*;
import java.nio.charset.*;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.channels.WritableByteChannel;
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
import java.nio.charset.CodingErrorAction;
import java.nio.charset.IllegalCharsetNameException;
public class StreamEncoder extends Writer
{
@ -158,8 +164,11 @@ public class StreamEncoder extends Writer
synchronized (lock) {
if (closed)
return;
implClose();
closed = true;
try {
implClose();
} finally {
closed = true;
}
}
}
@ -337,8 +346,13 @@ public class StreamEncoder extends Writer
writeBytes();
if (ch != null)
ch.close();
else
out.close();
else {
try {
out.flush();
} finally {
out.close();
}
}
} catch (IOException x) {
encoder.reset();
throw x;