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

Timestamp:

2013-05-29T01:27:07+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #8712 - workaround to "Comparison method violates its general contract" when sorting a collection in Java 7, disabled for local builds. Set new property jdk.Arrays.useLegacyMergeSort to true to enable the workaround for local builds.

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1344 +1344 @@
             // Ignore all exceptions
         }
+        // Workaround to fix another Java bug
+        // Force Java 7 to use old sorting algorithm of Arrays.sort (fix #8712).
+        // See Oracle bug database: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7075600 
+        // and http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6923200
+        if (Main.pref.getBoolean("jdk.Arrays.useLegacyMergeSort", !Version.getInstance().isLocalBuild())) {
+            updateSystemProperty("java.util.Arrays.useLegacyMergeSort", "true");
+        }
     }