diff --git a/src/share/classes/java/net/AbstractPlainSocketImpl.java b/src/share/classes/java/net/AbstractPlainSocketImpl.java index 8b2cc70f02ab56081914fdc8963022dbe14a3d5d..42653158542f25d91def0fae8a3d7070c86717b0 100644 --- a/src/share/classes/java/net/AbstractPlainSocketImpl.java +++ b/src/share/classes/java/net/AbstractPlainSocketImpl.java @@ -457,10 +457,10 @@ abstract class AbstractPlainSocketImpl extends SocketImpl } /* - * If connection has been reset then return 0 to indicate - * there are no buffered bytes. + * If connection has been reset or shut down for input, then return 0 + * to indicate there are no buffered bytes. */ - if (isConnectionReset()) { + if (isConnectionReset() || shut_rd) { return 0; } diff --git a/src/share/classes/java/net/Socket.java b/src/share/classes/java/net/Socket.java index bf145dc98fe7347f59923ef0943efbf894b657f4..0b047e4ef4c2ff003fe7308f3333583199dddb97 100644 --- a/src/share/classes/java/net/Socket.java +++ b/src/share/classes/java/net/Socket.java @@ -28,7 +28,6 @@ package java.net; import java.io.InputStream; import java.io.OutputStream; import java.io.IOException; -import java.io.InterruptedIOException; import java.nio.channels.SocketChannel; import java.security.AccessController; import java.security.PrivilegedExceptionAction; @@ -1436,8 +1435,9 @@ class Socket implements java.io.Closeable { * Any data sent to the input stream side of the socket is acknowledged * and then silently discarded. *

- * If you read from a socket input stream after invoking - * shutdownInput() on the socket, the stream will return EOF. + * If you read from a socket input stream after invoking this method on the + * socket, the stream's {@code available} method will return 0, and its + * {@code read} methods will return {@code -1} (end of stream). * * @exception IOException if an I/O error occurs when shutting down this * socket. diff --git a/src/share/classes/java/net/SocketImpl.java b/src/share/classes/java/net/SocketImpl.java index 495b18f2779e8cf1ecbd2ee637e8cdadbfb30796..3a4cf7aebdeeeed94a9a82b5e4f98301816edcb9 100644 --- a/src/share/classes/java/net/SocketImpl.java +++ b/src/share/classes/java/net/SocketImpl.java @@ -181,8 +181,9 @@ public abstract class SocketImpl implements SocketOptions { * Any data sent to this socket is acknowledged and then * silently discarded. * - * If you read from a socket input stream after invoking - * shutdownInput() on the socket, the stream will return EOF. + * If you read from a socket input stream after invoking this method on the + * socket, the stream's {@code available} method will return 0, and its + * {@code read} methods will return {@code -1} (end of stream). * * @exception IOException if an I/O error occurs when shutting down this * socket. diff --git a/test/java/net/Socket/ShutdownInput.java b/test/java/net/Socket/ShutdownInput.java new file mode 100644 index 0000000000000000000000000000000000000000..6754b4ec88964849753a91d1004df0baeee8e848 --- /dev/null +++ b/test/java/net/Socket/ShutdownInput.java @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2011, 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. + */ + +/* + * @test + * @bug 7014860 + * @summary Socket.getInputStream().available() not clear for + * case that connection is shutdown for reading + */ + +import java.io.InputStream; +import java.io.OutputStream; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.ServerSocket; +import java.net.Socket; +import java.nio.channels.ServerSocketChannel; +import java.nio.channels.SocketChannel; + +public class ShutdownInput { + static boolean failed = false; + + public static void main(String args[]) throws Exception { + InetAddress iaddr = InetAddress.getLocalHost(); + + try ( ServerSocket ss = new ServerSocket(0); + Socket s1 = new Socket(iaddr, ss.getLocalPort()); + Socket s2 = ss.accept() ) { + + test(s1, s2, "Testing NET"); + } + + // check the NIO socket adapter + try (ServerSocketChannel sc = ServerSocketChannel.open().bind(null); + SocketChannel s1 = SocketChannel.open( + new InetSocketAddress(iaddr, sc.socket().getLocalPort())); + SocketChannel s2 = sc.accept() ) { + + test(s1.socket(), s2.socket(), "Testing NIO"); + } + + if (failed) { + throw new RuntimeException("Failed: check output"); + } + } + + public static void test(Socket s1, Socket s2, String mesg) throws Exception { + OutputStream os = s1.getOutputStream(); + os.write("This is a message".getBytes("US-ASCII")); + + InputStream in = s2.getInputStream(); + s2.shutdownInput(); + + if (in.available() != 0) { + failed = true; + System.out.println(mesg + ":" + s2 + " in.available() should be 0, " + + "but returns "+ in.available()); + } + + byte[] ba = new byte[2]; + if (in.read() != -1 || + in.read(ba) != -1 || + in.read(ba, 0, ba.length) != -1) { + + failed = true; + System.out.append(mesg + ":" + s2 + " in.read() should be -1"); + } + } +}