Changeset 12238 in josm for trunk/src/org/openstreetmap/josm/tools/Utils.java

Timestamp:

2017-05-23T01:25:33+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11924 - make the JRE expiration date detection system work with Java 9

File:

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

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

@@ -1657 +1657 @@
     public static Date getJavaExpirationDate() {
         try {
-            Object value = Class.forName("com.sun.deploy.config.BuiltInProperties").getDeclaredField("JRE_EXPIRATION_DATE").get(null);
+            Object value = null;
+            Class<?> c = Class.forName("com.sun.deploy.config.BuiltInProperties");
+            try {
+                value = c.getDeclaredField("JRE_EXPIRATION_DATE").get(null);
+            } catch (NoSuchFieldException e) {
+                // Field is gone with Java 9, there's a method instead
+                Main.trace(e);
+                value = c.getDeclaredMethod("getProperty", String.class).invoke(null, "JRE_EXPIRATION_DATE");
+            }
             if (value instanceof String) {
                 return DateFormat.getDateInstance(3, Locale.US).parse((String) value);