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

8306308: (ch) Writer created by Channels::newWriter may lose data

Browse source 
Reviewed-by: djelinski, alanb
This commit is contained in:
Brian Burkhalter 2023-10-20 21:12:28 +00:00
parent 77b2394c46
commit a1a62d9964
3 changed files with 117 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/java/nio/channels/Channels.java
View file

@ -541,7 +541,9 @@ public final class Channels {
int minBufferCap)
{
Objects.requireNonNull(ch, "ch");
return StreamEncoder.forEncoder(ch, enc.reset(), minBufferCap);
Objects.requireNonNull(enc, "enc");
OutputStream out = newOutputStream(ch);
return StreamEncoder.forOutputStreamWriter(out, enc.reset());
}
/**

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

@ -31,7 +31,6 @@ 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;
@ -79,17 +78,12 @@ public final class StreamEncoder extends Writer {
return new StreamEncoder(out, lock, enc);
}
// Factory for java.nio.channels.Channels.newWriter
public static StreamEncoder forEncoder(WritableByteChannel ch,
CharsetEncoder enc,
int minBufferCap)
public static StreamEncoder forOutputStreamWriter(OutputStream out,
CharsetEncoder enc)
{
return new StreamEncoder(ch, enc, minBufferCap);
return new StreamEncoder(out, enc);
}
// -- Public methods corresponding to those in OutputStreamWriter --
// All synchronization and state/argument checking is done in these public
@ -252,9 +246,7 @@ public final class StreamEncoder extends Writer {
private ByteBuffer bb;
private final int maxBufferCapacity;
// Exactly one of these is non-null
private final OutputStream out;
private final WritableByteChannel ch;
// Leftover first char in a surrogate pair
private boolean haveLeftoverChar = false;
@ -271,7 +263,6 @@ public final class StreamEncoder extends Writer {
private StreamEncoder(OutputStream out, Object lock, CharsetEncoder enc) {
super(lock);
this.out = out;
this.ch = null;
this.cs = enc.charset();
this.encoder = enc;
@ -279,19 +270,14 @@ public final class StreamEncoder extends Writer {
this.maxBufferCapacity = MAX_BYTE_BUFFER_CAPACITY;
}
private StreamEncoder(WritableByteChannel ch, CharsetEncoder enc, int mbc) {
this.out = null;
this.ch = ch;
private StreamEncoder(OutputStream out, CharsetEncoder enc) {
super();
this.out = out;
this.cs = enc.charset();
this.encoder = enc;
if (mbc > 0) {
this.bb = ByteBuffer.allocate(mbc);
this.maxBufferCapacity = mbc;
} else {
this.bb = ByteBuffer.allocate(INITIAL_BYTE_BUFFER_CAPACITY);
this.maxBufferCapacity = MAX_BYTE_BUFFER_CAPACITY;
}
this.bb = ByteBuffer.allocate(INITIAL_BYTE_BUFFER_CAPACITY);
this.maxBufferCapacity = MAX_BYTE_BUFFER_CAPACITY;
}
private void writeBytes() throws IOException {
@ -302,12 +288,7 @@ public final class StreamEncoder extends Writer {
int rem = (pos <= lim ? lim - pos : 0);
if (rem > 0) {
if (ch != null) {
int wc = ch.write(bb);
assert wc == rem : rem;
} else {
out.write(bb.array(), bb.arrayOffset() + pos, rem);
}
out.write(bb.array(), bb.arrayOffset() + pos, rem);
}
bb.clear();
}
@ -408,13 +389,11 @@ public final class StreamEncoder extends Writer {
void implFlush() throws IOException {
implFlushBuffer();
if (out != null) {
out.flush();
}
out.flush();
}
void implClose() throws IOException {
try (ch; out) {
try (out) {
flushLeftoverChar(null, true);
for (;;) {
CoderResult cr = encoder.flush(bb);
@ -430,8 +409,7 @@ public final class StreamEncoder extends Writer {
if (bb.position() > 0)
writeBytes();
if (out != null)
out.flush();
out.flush();
} catch (IOException x) {
encoder.reset();
throw x;