Changeset 17693 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2021-03-30T15:42:02+02:00 (4 years ago)

Author:

simon04

Message:

see #20621 - Fix JVM crash when running headless Java 8 tests on Windows

File:

• trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (6 diffs)

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -3 +3 @@
 
 import java.awt.Color;
+import java.awt.GraphicsEnvironment;
+import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.event.WindowEvent;
@@ -15 +17 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
@@ -22 +25 @@
 import java.util.TimeZone;
 import java.util.logging.Handler;
+import java.util.logging.Level;
 
 import org.awaitility.Awaitility;
@@ -70 +74 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MemoryManagerTest;
+import org.openstreetmap.josm.tools.PlatformManager;
 import org.openstreetmap.josm.tools.Territories;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.bugreport.ReportedException;
 import org.openstreetmap.josm.tools.date.DateUtils;
@@ -614 +620 @@
                 }
 
+                workaroundJdkBug8159956();
                 new MainApplication();
                 JOSMFixture.initContentPane();
@@ -620 +627 @@
                 JOSMFixture.initMainMenu();
             }
+        }
+    }
+
+    private void workaroundJdkBug8159956() {
+        try {
+            if (PlatformManager.isPlatformWindows() && Utils.getJavaVersion() == 8 && GraphicsEnvironment.isHeadless()) {
+                // https://bugs.openjdk.java.net/browse/JDK-8159956
+                Method initIDs = Toolkit.class.getDeclaredMethod("initIDs");
+                initIDs.setAccessible(true);
+                initIDs.invoke(Toolkit.getDefaultToolkit());
+            }
+        } catch (Exception e) {
+            Logging.log(Level.WARNING, "Failed to Toolkit.initIDs", e);
         }
     }