8306308: (ch) Writer created by Channels::newWriter may lose data
Reviewed-by: djelinski, alanb
This commit is contained in:
parent
77b2394c46
commit
a1a62d9964
src/java.base/share/classes
test/jdk/java/nio/channels/Channels
@ -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());
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -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;
|
||||
|
102
test/jdk/java/nio/channels/Channels/NewWriter.java
Normal file
102
test/jdk/java/nio/channels/Channels/NewWriter.java
Normal file
@ -0,0 +1,102 @@
|
||||
/*
|
||||
* Copyright (c) 2023, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.Writer;
|
||||
import java.net.InetAddress;
|
||||
import java.net.InetSocketAddress;
|
||||
import java.net.ServerSocket;
|
||||
import java.net.StandardSocketOptions;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.channels.Channels;
|
||||
import java.nio.channels.IllegalBlockingModeException;
|
||||
import java.nio.channels.SocketChannel;
|
||||
import java.nio.channels.WritableByteChannel;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @bug 8295797
|
||||
* @summary Test behavior of Channels.newWriter for WritableByteChannels
|
||||
* @run junit NewWriter
|
||||
*/
|
||||
public class NewWriter {
|
||||
private static final String STRING = "test";
|
||||
private static final int COUNT = 5;
|
||||
private static final int EXPECTED = COUNT*STRING.length();
|
||||
private int actual = 0;
|
||||
|
||||
@Test
|
||||
public void oneByteChannel() throws IOException {
|
||||
try (Writer writer = Channels.newWriter(new WritableByteChannel() {
|
||||
@Override
|
||||
public int write(ByteBuffer src) {
|
||||
System.out.print((char) src.get());
|
||||
actual++;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOpen() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() {
|
||||
}
|
||||
}, StandardCharsets.UTF_8)) {
|
||||
for (int i = 1; i <= COUNT; i++) {
|
||||
writer.write(STRING);
|
||||
writer.flush();
|
||||
System.out.println(i);
|
||||
}
|
||||
}
|
||||
assertEquals(EXPECTED, actual);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void socketChannel() throws IOException {
|
||||
Throwable thrown = assertThrows(IllegalBlockingModeException.class,
|
||||
() -> {
|
||||
try (ServerSocket ss = new ServerSocket();
|
||||
SocketChannel sc = SocketChannel.open()) {
|
||||
|
||||
InetAddress lb = InetAddress.getLoopbackAddress();
|
||||
ss.bind(new InetSocketAddress(lb, 0));
|
||||
sc.connect(ss.getLocalSocketAddress());
|
||||
sc.configureBlocking(false);
|
||||
sc.setOption(StandardSocketOptions.SO_SNDBUF, 8192);
|
||||
try (Writer writer = Channels.newWriter(sc,
|
||||
StandardCharsets.UTF_8)) {
|
||||
for (int i = 1; i < Integer.MAX_VALUE; i++) {
|
||||
writer.write("test" + i);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user