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

Timestamp:

2022-06-14T08:46:54+02:00 (3 years ago)

Author:

stoecker

Message:

fix #22109 - fix IPv6 detection, as api.openstreetmap.org fails in Java.isReachable() nowadays

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -1277 +1277 @@
                                 for (InetAddress b : InetAddress.getAllByName("api.openstreetmap.org")) {
                                     if (b instanceof Inet6Address) {
-                                        if (b.isReachable(1000)) {
-                                            SSLSocketFactory.getDefault().createSocket(b, 443).close();
-                                        } else {
-                                            hasv6 = false;
-                                        }
+                                        //if (b.isReachable(1000)) {
+                                        SSLSocketFactory.getDefault().createSocket(b, 443).close();
+                                        //} else {
+                                        //    hasv6 = false;
+                                        //}
                                         break; /* we're done */
                                     }
                                 }
-                                Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true");
-                                if (!wasv6) {
-                                    Logging.info(tr("Detected usable IPv6 network, preferring IPv6 over IPv4 after next restart."));
-                                } else {
-                                    Logging.info(tr("Detected usable IPv6 network, preferring IPv6 over IPv4."));
+                                if(hasv6) {
+                                    Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true");
+                                    if (!wasv6) {
+                                        Logging.info(tr("Detected usable IPv6 network, preferring IPv6 over IPv4 after next restart."));
+                                    } else {
+                                        Logging.info(tr("Detected usable IPv6 network, preferring IPv6 over IPv4."));
+                                    }
                                 }
                             }
@@ -1300 +1302 @@
                     Logging.trace(e);
                 }
+                Config.getPref().putBoolean("validated.ipv6", hasv6); // be sure it is stored before the restart!
                 if (wasv6 && !hasv6) {
                     Logging.info(tr("Detected no usable IPv6 network, preferring IPv4 over IPv6 after next restart."));
-                    Config.getPref().putBoolean("validated.ipv6", hasv6); // be sure it is stored before the restart!
                     RestartAction.restartJOSM();
                 }
-                Config.getPref().putBoolean("validated.ipv6", hasv6);
             }, "IPv6-checker").start();
         }