Changeset 7826 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2014-12-19T01:13:22+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10833 - simplify remote control interface management: listen on 127.0.0.1 instead of localhost

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java

@@ -38 +38 @@
     static final int protocolMinorVersion = 7;
 
-    private static final String LOCALHOST = "localhost";
+    private static final String LOCALHOST = "127.0.0.1";
 
     /**
@@ -84 +84 @@
      */
     public static InetAddress getInetAddress() throws UnknownHostException {
-        String hostname = Main.pref.get("remote.control.host", LOCALHOST);
-        InetAddress result = InetAddress.getByName(hostname);
-        // Sometimes localhost resolution does not work as expected, see #10833
-        if (LOCALHOST.equalsIgnoreCase(hostname) && !LOCALHOST.equalsIgnoreCase(result.getHostName())) {
-            InetAddress localhostAddr = InetAddress.getLocalHost();
-            // Use this result if it's better. Not sure if it's a Java bug or not
-            if (LOCALHOST.equalsIgnoreCase(localhostAddr.getHostName())) {
-                result = localhostAddr;
-            }
-        }
-        return result;
+        return InetAddress.getByName(Main.pref.get("remote.control.host", LOCALHOST));
     }
 }