TheCloud/angelauramc-openjdk-build
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/angelauramc-openjdk-build.git synced 2025-08-03 07:35:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Workaound[Collections]: allow legacy sort api of Collections

Browse Source
This commit is contained in:
Boulay Mathias 2023-08-25 00:26:25 +02:00 committed by GitHub
parent 438cd12185
commit aeb8465273
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
patches/jdk8u_android.diff
View File

@ -60892,3 +60892,53 @@ index 303c96d788..aa555cc286 100644
+ }
+
/**
diff --git a/jdk/src/share/classes/java/util/Collections.java b/jdk/src/share/classes/java/util/Collections.java
index 3ab4c5ec06..768854e005 100644
--- a/jdk/src/share/classes/java/util/Collections.java
+++ b/jdk/src/share/classes/java/util/Collections.java
@@ -111,2 +111,14 @@ public class Collections {
+ /**
+ * Old sort allocation implementation can be selected (for
+ * compatibility with broken iterators) using a system property.
+ * This behavior was changed with JDK8_u20
+ */
+ public static final class LegacyAllocationSort {
+ private static final boolean userRequested =
+ java.security.AccessController.doPrivileged(
+ new sun.security.action.GetBooleanAction(
+ "java.util.Arrays.useLegacyCollectionsListSort")).booleanValue();
+ }
+
/**
@@ -142,3 +154,13 @@ public class Collections {
public static <T extends Comparable<? super T>> void sort(List<T> list) {
- list.sort(null);
+ if(LegacyAllocationSort.userRequested) {
+ Object[] a = list.toArray();
+ Arrays.sort(a);
+ ListIterator<T> i = list.listIterator();
+ for (int j=0; j<a.length; j++) {
+ i.next();
+ i.set((T)a[j]);
+ }
+ } else {
+ list.sort(null);
+ }
}
@@ -176,3 +198,13 @@ public class Collections {
public static <T> void sort(List<T> list, Comparator<? super T> c) {
- list.sort(c);
+ if(LegacyAllocationSort.userRequested) {
+ Object[] a = list.toArray();
+ Arrays.sort(a, (Comparator)c);
+ ListIterator<T> i = list.listIterator();
+ for (int j=0; j<a.length; j++) {
+ i.next();
+ i.set((T)a[j]);
+ }
+ } else {
+ list.sort(c);
+ }
}