diff -r eb172a3b1c1c -r 04946947ca79 src/java.base/share/classes/java/net/ServerSocket.java --- a/src/java.base/share/classes/java/net/ServerSocket.java Thu Oct 17 08:56:06 2019 +0100 +++ b/src/java.base/share/classes/java/net/ServerSocket.java Wed Oct 16 11:12:47 2019 +0100 @@ -749,14 +749,15 @@ /** * Enable/disable {@link SocketOptions#SO_TIMEOUT SO_TIMEOUT} with the - * specified timeout, in milliseconds. With this option set to a non-zero - * timeout, a call to accept() for this ServerSocket + * specified timeout, in milliseconds. With this option set to a positive + * timeout value, a call to accept() for this ServerSocket * will block for only this amount of time. If the timeout expires, * a java.net.SocketTimeoutException is raised, though the - * ServerSocket is still valid. The option must be enabled - * prior to entering the blocking operation to have effect. The - * timeout must be {@code > 0}. - * A timeout of zero is interpreted as an infinite timeout. + * ServerSocket is still valid. A timeout of zero is interpreted as an + * infinite timeout. + * The option must be enabled prior to entering the blocking + * operation to have effect. + * * @param timeout the specified timeout, in milliseconds * @throws SocketException if there is an error in the underlying protocol, * such as a TCP error