--- a/jdk/src/java.base/share/classes/java/net/InetAddress.java	Wed Nov 11 09:19:12 2015 +0000
+++ b/jdk/src/java.base/share/classes/java/net/InetAddress.java	Wed Nov 11 22:38:15 2015 -0500
@@ -29,6 +29,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Objects;
 import java.util.ServiceLoader;
 import java.security.AccessController;
 import java.io.ObjectStreamException;
@@ -733,7 +734,7 @@
      */
     public String toString() {
         String hostName = holder().getHostName();
-        return ((hostName != null) ? hostName : "")
+        return Objects.toString(hostName, "")
             + "/" + getHostAddress();
     }