commit c7f73eb9b360fd3b538246fb49f45f730863c8dc
author Sebastien Hertz <shertz@google.com> Mon Apr 10 11:47:40 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 10 11:47:42 2017 +0000
tree 6daa74c4a0784c9bbf8d96dcaee26363f62a2284
parent 24c6abe6d0d0ba8e54baa54c0dee484c3060ca70
parent 27f589175798e2b081ff3b411292735f07abfd1c

Merge "Workaround localhost issues on old runtimes"

jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/SocketTransportWrapper.java

diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/SocketTransportWrapper.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/SocketTransportWrapper.java
index 74fe05f..2a8eeb0 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/SocketTransportWrapper.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/SocketTransportWrapper.java
@@ -95,7 +95,11 @@
             iAddress = InetAddress.getLocalHost();
         }
 
-        address = iAddress.getHostName() + ":" + serverSocket.getLocalPort();
+        // Older Android runtimes may fail to resolve 'localhost' on a host machine. The workaround
+        // is to use the address instead of the hostname.
+        String hostNameOrAddress =
+                iAddress.isLoopbackAddress() ? iAddress.getHostAddress() : iAddress.getHostName();
+        address = hostNameOrAddress + ":" + serverSocket.getLocalPort();
         return address;
     }