Merge "Fix ReferenceTest#test_subclass."
diff --git a/luni/src/test/java/libcore/java/net/InetAddressTest.java b/luni/src/test/java/libcore/java/net/InetAddressTest.java
index 4a2cb5e..e4c97d2 100644
--- a/luni/src/test/java/libcore/java/net/InetAddressTest.java
+++ b/luni/src/test/java/libcore/java/net/InetAddressTest.java
@@ -349,6 +349,12 @@
assertTrue(inetAddress.isLoopbackAddress());
}
+ public void test_getByName_empty() throws Exception {
+ InetAddress inetAddress = InetAddress.getByName("");
+ assertEquals(LOOPBACK6_BYTES, "localhost", inetAddress);
+ assertTrue(inetAddress.isLoopbackAddress());
+ }
+
public void test_getAllByName_localhost() throws Exception {
InetAddress[] inetAddresses = InetAddress.getAllByName("localhost");
assertEquals(1, inetAddresses.length);
diff --git a/ojluni/src/main/java/java/net/InetAddress.java b/ojluni/src/main/java/java/net/InetAddress.java
index 06a22c5..f09af96 100755
--- a/ojluni/src/main/java/java/net/InetAddress.java
+++ b/ojluni/src/main/java/java/net/InetAddress.java
@@ -948,7 +948,7 @@
if (host == null || host.length() == 0) {
// Android-changed : Return both the Inet4 and Inet6 loopback addresses
// when host == null or empty.
- return new InetAddress[] { Inet4Address.LOOPBACK, Inet6Address.LOOPBACK };
+ return loopbackAddresses();
}
// if host is an IP address, we won't do further lookup