The jsr203/nio2 defined updates to the socket-channel API were integrated into jdk7-b36 via 4640544. There have been a few small improvements to this API based on feedback and issues found since. This bug tracks sync'ing this part of the API with jsr203/nio2-b99 as follows:

1. The description of the IP_TOS and TCP_NODELAY socket options in java.net.StandardSocketOption has been clarified.

2. The MulticastChannel#join methods now define that UOE be thrown if the channel's socket is not an Internet Protocol socket.

3. The MembershipKey#drop() and MembershipKey#unblock methods no longer throw IOException.

4. The NetworkChannel#setOption/getOption now define UOE to be thrown if the socket option not supported.

5. NetworkChannel#getLocalAddress() now defines ClosedChannelException to be thrown if invoked on a closed channel.

6. The following methods have been renamed (no semantic changes):
MembershipKey#getChannel() -> channel()
MembershipKey#getGroup() -> group()
MembershipKey#getNetworkInterface() -> networkInterface()
MembershipKey#getSourceAddress() -> sourceAddress()
NetworkChannel#options() -> supportedOptions()

7. The following methods have been renamed and now defined that ClosedChannelException be thrown if invoked on a closed channel:
SocketChannel#getConnectedAddress() -> getRemoteAddress()
DatagramChannel#getConnectedAdress() -> getRemoteAddress()