Changeset 8816 in josm


Ignore:
Timestamp:
2015-10-03T01:03:20+02:00 (2 years ago)
Author:
Don-vip
Message:

see #11924 - JDK9 Jigsaw: workaround for https://bugs.openjdk.java.net/browse/JI-9025152

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/Preferences.java

    r8557 r8816  
    14831483        Utils.updateSystemProperty("user.language", get("language"));
    14841484        // Workaround to fix a Java bug.
    1485         // Force AWT toolkit to update its internal preferences (fix #3645).
     1485        // Force AWT toolkit to update its internal preferences (fix #6345).
    14861486        // This ugly hack comes from Sun bug database: https://bugs.openjdk.java.net/browse/JDK-6292739
    14871487        try {
     
    14891489            field.setAccessible(true);
    14901490            field.set(null, ResourceBundle.getBundle("sun.awt.resources.awt"));
    1491         } catch (Exception e) {
    1492             // Ignore all exceptions
     1491        } catch (Exception | InternalError e) {
     1492            // Ignore all exceptions, including internal error raised by Java 9 Jigsaw EA:
     1493            // java.lang.InternalError: legacy getBundle can't be used to find sun.awt.resources.awt in module java.desktop
     1494            // InternalError catch to remove when https://bugs.openjdk.java.net/browse/JI-9025152 is resolved
    14931495            if (Main.isTraceEnabled()) {
    14941496                Main.trace(e.getMessage());
Note: See TracChangeset for help on using the changeset viewer.