Changeset 13990 in josm for trunk/src/org

Timestamp:

2018-06-30T19:35:21+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16047 - don't ask Java 8 users to upgrade to Java 10

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -1743 +1743 @@
     public static String getJavaLatestVersion() {
         try {
-            return HttpClient.create(
+            String[] versions = HttpClient.create(
                     new URL(Config.getPref().get(
                             "java.baseline.version.url",
                             "http://javadl-esd-secure.oracle.com/update/baseline.version")))
-                    .connect().fetchContent().split("\n")[0];
+                    .connect().fetchContent().split("\n");
+            if (getJavaVersion() <= 8) {
+                for (String version : versions) {
+                    if (version.startsWith("1.8")) {
+                        return version;
+                    }
+                }
+            }
+            return versions[0];
         } catch (IOException e) {
             Logging.error(e);