commit 60f1a004ad61737726a4a343938b4cc7f2dfdc52
author Victor Chang <vichang@google.com> Thu Oct 05 20:08:26 2017 +0100
committer vichang <vichang@google.com> Mon Oct 09 17:32:41 2017 +0000
tree 50ffc1c585b54f0de2adea2b453bf5ef6f403309
parent 2f03b6ebe321c99bd2f25497cf3fa283048348bb

Socket: Integrate upstream changes from 8u121-b13

- Minor javadoc changes

Bug: 64065632
Test: m
Change-Id: Ib1a353252377d1b106dd086bfbf4a711cb10842e

ojluni/src/main/java/java/net/Socket.java

diff --git a/ojluni/src/main/java/java/net/Socket.java b/ojluni/src/main/java/java/net/Socket.java
index 03e2b71..f509bcd 100644
--- a/ojluni/src/main/java/java/net/Socket.java
+++ b/ojluni/src/main/java/java/net/Socket.java
@@ -1060,7 +1060,7 @@
      *
      * The setting only affects socket close.
      *
-     * @return the setting for SO_LINGER.
+     * @return the setting for {@link SocketOptions#SO_LINGER SO_LINGER}.
      * @exception SocketException if there is an error
      * in the underlying protocol, such as a TCP error.
      * @since   JDK1.1