SeleniumHQ
diff --git a/‎java/client/src/org/openqa/selenium/WebDriverException.java‎
Lines changed: 87 additions & 15 deletions b/‎java/client/src/org/openqa/selenium/WebDriverException.java‎
Lines changed: 87 additions & 15 deletions
@@ -19,19 +19,99 @@
 
 import org.openqa.selenium.internal.BuildInfo;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
 import java.net.UnknownHostException;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 public class WebDriverException extends RuntimeException {
 
   public static final String SESSION_ID = "Session ID";
   public static final String DRIVER_INFO = "Driver info";
   protected static final String BASE_SUPPORT_URL = "http://seleniumhq.org/exceptions/";
 
+  private final static String HOST_NAME;
+  private final static String HOST_ADDRESS;
+
   private Map<String, String> extraInfo = new HashMap<>();
 
+  static {
+    // Ideally, we'd use InetAddress.getLocalHost, but this does a reverse DNS lookup. On Windows
+    // and Linux this is apparently pretty fast, so we don't get random hangs. On OS X it's
+    // amazingly slow. That's less than ideal. Figure things out and cache. We can't rely on
+    // Platform since that depends on this class, but fortunately there's only one place we have to
+    // worry about slow lookups.
+
+    String current = System.getProperty("os.name");
+    String host = System.getenv("HOSTNAME");  // Most OSs
+    if (host == null) {
+      host = System.getenv("COMPUTERNAME");  // Windows
+    }
+    if (host == null && "Mac OS X".equals(current)) {
+      try {
+        Process process = Runtime.getRuntime().exec("hostname");
+
+        if (!process.waitFor(2, TimeUnit.SECONDS)) {
+          process.destroyForcibly();
+        }
+        if (process.exitValue() == 0) {
+          try (InputStreamReader isr = new InputStreamReader(process.getInputStream());
+               BufferedReader reader = new BufferedReader(isr)) {
+            host = reader.readLine();
+          }
+        }
+      } catch (IOException ignored) {
+        // Do nothing and fall through
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+        throw new RuntimeException(e);
+      }
+    }
+    if (host == null) {
+      // Give up.
+      try {
+        host = InetAddress.getLocalHost().getHostName();
+      } catch (UnknownHostException e) {
+        host = "Unknown";  // At least we tried.
+      }
+    }
+
+    HOST_NAME = host;
+
+    String address = null;
+    // Now for the IP address. We're going to do silly shenanigans on OS X only.
+    if ("Mac OS X".equals(current)) {
+      try {
+        NetworkInterface en0 = NetworkInterface.getByName("en0");
+        Enumeration<InetAddress> addresses = en0.getInetAddresses();
+        while (addresses.hasMoreElements()) {
+          InetAddress inetAddress = addresses.nextElement();
+          address = inetAddress.getHostAddress();
+          break;
+        }
+      } catch (SocketException e) {
+        // Fall through and go the slow way.
+      }
+    }
+    if (address == null) {
+      // Alright. I give up.
+      try {
+        address = InetAddress.getLocalHost().getHostAddress();
+      } catch (UnknownHostException e) {
+        address = "Unknown";
+      }
+    }
+
+    HOST_ADDRESS = address;
+  }
+
   public WebDriverException() {
     super();
   }
@@ -66,21 +146,13 @@ private String createMessage(String originalMessageString) {
   }
 
   public String getSystemInformation() {
-    String host = "N/A";
-    String ip   = "N/A";
-
-    try{
-      host = InetAddress.getLocalHost().getHostName();
-      ip   = InetAddress.getLocalHost().getHostAddress();
-    } catch (UnknownHostException throw_away) {}
-
     return String.format("System info: host: '%s', ip: '%s', os.name: '%s', os.arch: '%s', os.version: '%s', java.version: '%s'",
-      host,
-      ip,
-      System.getProperty("os.name"),
-      System.getProperty("os.arch"),
-      System.getProperty("os.version"),
-      System.getProperty("java.version"));
+        HOST_NAME,
+        HOST_ADDRESS,
+        System.getProperty("os.name"),
+        System.getProperty("os.arch"),
+        System.getProperty("os.version"),
+        System.getProperty("java.version"));
   }
 
   public String getSupportUrl() {
@@ -108,7 +180,7 @@ public void addInfo(String key, String value) {
   }
 
   public String getAdditionalInformation() {
-    if (! extraInfo.containsKey(DRIVER_INFO)) {
+    if (!extraInfo.containsKey(DRIVER_INFO)) {
       extraInfo.put(DRIVER_INFO, "driver.version: " + getDriverName(getStackTrace()));
     }