diff options
| author | vichang <vichang@google.com> | 2017-09-27 15:48:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-27 15:48:33 +0000 |
| commit | 03e4ff97a4f3e41f5c28bf371a8a15c7645d895c (patch) | |
| tree | 27614b92f20bc627cf3106ba38c917893d21da07 | |
| parent | 662a0681f0b5566b76ddddafba9157024112536e (diff) | |
| parent | f80cfe45766e3a44a98c89438760f09c9b32d4ee (diff) | |
Merge "Integrate upstream changes in ServerSocket from 8u121-b13"
| -rw-r--r-- | ojluni/src/main/java/java/net/ServerSocket.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ojluni/src/main/java/java/net/ServerSocket.java b/ojluni/src/main/java/java/net/ServerSocket.java index 20ae95a9aa..f70a6b1c29 100644 --- a/ojluni/src/main/java/java/net/ServerSocket.java +++ b/ojluni/src/main/java/java/net/ServerSocket.java @@ -446,8 +446,7 @@ class ServerSocket implements java.io.Closeable { } /** - * Returns the address of the endpoint this socket is bound to, or - * {@code null} if it is not bound yet. + * Returns the address of the endpoint this socket is bound to. * <p> * If the socket was bound prior to being {@link #close closed}, * then this method will continue to return the address of the endpoint |