[java] Making non-loopback ipv4 address caching a bit smarter

SeleniumHQ · Mar 26, 2019 · 1bd9f5f · 1bd9f5f
1 parent 5c2dcce
commit 1bd9f5f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/java/client/src/org/openqa/selenium/net/NetworkUtils.java b/java/client/src/org/openqa/selenium/net/NetworkUtils.java
@@ -34,11 +34,13 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 public class NetworkUtils {
 
-  private static String cachedNonLoopbackAddressOfThisMachine;
+  private static InetAddress cachedIp4NonLoopbackAddressOfThisMachine;
+  private static String cachedIp4NonLoopbackAddressHostName;
 
   private final NetworkInterfaceProvider networkInterfaceProvider;
   private volatile String hostname;
@@ -86,10 +88,12 @@ public String getPrivateLocalAddress() {
    * @return A String representing the host name or non-loopback IP4 address of this machine.
    */
   public String getNonLoopbackAddressOfThisMachine() {
-    if (cachedNonLoopbackAddressOfThisMachine == null) {
-      cachedNonLoopbackAddressOfThisMachine = getIp4NonLoopbackAddressOfThisMachine().getHostName();
+    InetAddress ip4NonLoopbackAddressOfThisMachine = getIp4NonLoopbackAddressOfThisMachine();
+    if (! Objects.equals(cachedIp4NonLoopbackAddressOfThisMachine, ip4NonLoopbackAddressOfThisMachine)) {
+      cachedIp4NonLoopbackAddressOfThisMachine = ip4NonLoopbackAddressOfThisMachine;
+      cachedIp4NonLoopbackAddressHostName = ip4NonLoopbackAddressOfThisMachine.getHostName();
     }
-    return cachedNonLoopbackAddressOfThisMachine;
+    return cachedIp4NonLoopbackAddressHostName;
   }
 
   /**