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

Timestamp:

2019-06-23T23:16:11+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17831 - make sure we don't ask to update to current version of Java by mistake

File:

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

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

@@ -291 +291 @@
         Date expiration = Utils.getJavaExpirationDate();
         if (expiration != null && expiration.before(new Date())) {
-            String version = Utils.getJavaLatestVersion();
-            callback.askUpdateJava(version != null ? version : "latest",
-                    Config.getPref().get("java.update.url", "https://www.java.com/download"),
-                    DateUtils.getDateFormat(DateFormat.MEDIUM).format(expiration), false);
+            String latestVersion = Utils.getJavaLatestVersion();
+            String currentVersion = Utils.getSystemProperty("java.version");
+            // #17831 WebStart may be launched with an expired JRE but then launching JOSM with up-to-date JRE
+            if (latestVersion == null || !latestVersion.equalsIgnoreCase(currentVersion)) {
+                callback.askUpdateJava(latestVersion != null ? latestVersion : "latest",
+                        Config.getPref().get("java.update.url", "https://www.java.com/download"),
+                        DateUtils.getDateFormat(DateFormat.MEDIUM).format(expiration), false);
+            }
         }
     }