Changeset 12238 in josm for trunk

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

Location:

trunk

Files:

• build.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)

trunk/build.xml

@@ -144 +144 @@
                 <attribute name="Application-Name" value="JOSM - Java OpenStreetMap Editor"/>
                 <!-- Java 9 stuff. Entries are safely ignored by Java 8 -->
-                <attribute name="Add-Exports" value="java.base/sun.security.util java.base/sun.security.x509" />
+                <attribute name="Add-Exports" value="java.base/sun.security.util java.base/sun.security.x509 jdk.deploy/com.sun.deploy.config" />
                 <attribute name="Add-Opens" value="java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
             </manifest>
@@ -444 +444 @@
                     <jvmarg value="--add-exports" if:set="isJava9" />
                     <jvmarg value="java.base/sun.security.x509=ALL-UNNAMED" if:set="isJava9" />
+                    <jvmarg value="--add-exports" if:set="isJava9" />
+                    <jvmarg value="jdk.deploy/com.sun.deploy.config=ALL-UNNAMED" if:set="isJava9" />
                     <jvmarg value="--add-opens" if:set="isJava9" />
                     <jvmarg value="java.base/java.io=ALL-UNNAMED" if:set="isJava9" />

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);