# HG changeset patch # User bpb # Date 1549473658 28800 # Node ID 95c486f5c444d7235ccd427836cedf4609177c28 # Parent 87484051dbba1762608e2a23bc0eea22b7675ea9 rsocket-branch: further clean up RdmaSockets options specification diff -r 87484051dbba -r 95c486f5c444 src/jdk.net/share/classes/jdk/net/RdmaSockets.java --- a/src/jdk.net/share/classes/jdk/net/RdmaSockets.java Tue Feb 05 14:19:11 2019 -0800 +++ b/src/jdk.net/share/classes/jdk/net/RdmaSockets.java Wed Feb 06 09:20:58 2019 -0800 @@ -80,10 +80,9 @@ *

An RDMA socket supports the socket options * {@link java.net.StandardSocketOptions#SO_RCVBUF SO_RCVBUF}, * {@link java.net.StandardSocketOptions#SO_REUSEADDR SO_REUSEADDR}, - * {@link java.net.StandardSocketOptions#SO_SNDBUF SO_SNDBUF}, and - * {@link java.net.StandardSocketOptions#TCP_NODELAY TCP_NODELAY} - * defined by {@link java.net.Socket java.net.Socket}. In addition, - * it supports the socket options specified by {@link RdmaSocketOptions}. + * {@link java.net.StandardSocketOptions#SO_SNDBUF SO_SNDBUF}, + * {@link java.net.StandardSocketOptions#TCP_NODELAY TCP_NODELAY}, + * and those specified by {@link RdmaSocketOptions}. * *

When binding the socket to a local address, or invoking {@code * connect} to connect the socket, the socket address specified to those @@ -112,11 +111,9 @@ * Creates an unbound RDMA server socket. * *

An RDMA server socket supports the socket options - * {@link java.net.StandardSocketOptions#SO_RCVBUF SO_RCVBUF} and - * {@link java.net.StandardSocketOptions#SO_REUSEADDR SO_REUSEADDR} - * defined by {@link java.net.ServerSocket java.net.ServerSocket}. - * In addition, it supports the socket options specified by - * {@link RdmaSocketOptions}. + * {@link java.net.StandardSocketOptions#SO_RCVBUF SO_RCVBUF}, + * {@link java.net.StandardSocketOptions#SO_REUSEADDR SO_REUSEADDR}, + * and those specified by {@link RdmaSocketOptions}. * *

When binding the socket to an address, the socket address specified * to the {@code bind} method must correspond to the protocol family @@ -151,10 +148,9 @@ *

A socket channel to an RDMA socket supports the socket options * {@link java.net.StandardSocketOptions#SO_RCVBUF SO_RCVBUF}, * {@link java.net.StandardSocketOptions#SO_REUSEADDR SO_REUSEADDR}, - * {@link java.net.StandardSocketOptions#SO_SNDBUF SO_SNDBUF}, and - * {@link java.net.StandardSocketOptions#TCP_NODELAY TCP_NODELAY} - * defined by {@link java.net.Socket java.net.Socket}. In addition, - * it supports the socket options specified by {@link RdmaSocketOptions}. + * {@link java.net.StandardSocketOptions#SO_SNDBUF SO_SNDBUF}, + * {@link java.net.StandardSocketOptions#TCP_NODELAY TCP_NODELAY}, + * and those specified by {@link RdmaSocketOptions}. * *

When binding the channel's socket to a local address, or invoking * {@code connect} to connect channel's socket, the socket address specified @@ -185,13 +181,10 @@ * channel is {@link SocketChannel#isOpen() open} but not yet bound to a * {@link SocketChannel#getLocalAddress() local address}. * - *

A server socket channel to an RDMA server socket supports the - * socket options - * {@link java.net.StandardSocketOptions#SO_RCVBUF SO_RCVBUF} and - * {@link java.net.StandardSocketOptions#SO_REUSEADDR SO_REUSEADDR} - * defined by {@link java.net.ServerSocket java.net.ServerSocket}. - * In addition, it supports the socket options specified by - * {@link RdmaSocketOptions}. + *

A server socket channel to an RDMA server socket supports the socket + * options {@link java.net.StandardSocketOptions#SO_RCVBUF SO_RCVBUF}, + * {@link java.net.StandardSocketOptions#SO_REUSEADDR SO_REUSEADDR}, + * and those specified by {@link RdmaSocketOptions}. * *

When binding the channel's socket to an address, the socket address * specified to the {@code bind} method must correspond to the protocol