commit f61a3ad3f3ac86e7120caee9ef6c031eec53f7b9
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Mon Jan 04 10:07:32 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 04 10:07:32 2016 +0000
tree f71d7a5af101450688e6d58bd3ec3aac3cfe650c
parent 0f9610a5a74e503d82857bf9d3edeabffbe827b1
parent e789c59925d49a3a4d43be11d46061eb8879f6b7

Merge "SocketChannelTest#testSocket_NonBlock_BasicStatusAfterConnect fix"

ojluni/src/main/java/sun/nio/ch/SocketAdaptor.java

diff --git a/ojluni/src/main/java/sun/nio/ch/SocketAdaptor.java b/ojluni/src/main/java/sun/nio/ch/SocketAdaptor.java
index 8a8b667..d2ebde5 100755
--- a/ojluni/src/main/java/sun/nio/ch/SocketAdaptor.java
+++ b/ojluni/src/main/java/sun/nio/ch/SocketAdaptor.java
@@ -158,6 +158,11 @@
     }
 
     public InetAddress getInetAddress() {
+        // Use #remoteAddress and do manual isConnected check. #getRemoteAddress() returns
+        // non-null result before connection.
+        if (!isConnected()) {
+            return null;
+        }
         SocketAddress remote = sc.remoteAddress();
         if (remote == null) {
             return null;
@@ -176,6 +181,11 @@
     }
 
     public int getPort() {
+        // Use #remoteAddress and do manual isConnected check. #getRemoteAddress() returns
+        // non-null result before connection.
+        if (!isConnected()) {
+          return 0;
+        }
         SocketAddress remote = sc.remoteAddress();
         if (remote == null) {
             return 0;