Skip to content
This repository was archived by the owner on May 26, 2018. It is now read-only.

FML's CoreModManager.sortTweakList causes LaunchWrapper to throw CME with Java 8u20 #501

Closed
wants to merge 1 commit into from
Closed

FML's CoreModManager.sortTweakList causes LaunchWrapper to throw CME with Java 8u20 #501

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/main/java/cpw/mods/fml/relauncher/CoreModManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
Expand Down Expand Up @@ -533,7 +534,10 @@ public static void sortTweakList()
{
@SuppressWarnings("unchecked")
List<ITweaker> tweakers = (List<ITweaker>) Launch.blackboard.get("Tweaks");
Collections.sort(tweakers, new Comparator<ITweaker>() {

// We're not using Collections.sort to avoid CME with Java 8u20 (see issue #501)
ITweaker[] tweakersArray = tweakers.toArray(new ITweaker[tweakers.size()]);
Arrays.sort(tweakersArray, new Comparator<ITweaker>() {
@Override
public int compare(ITweaker o1, ITweaker o2)
{
Expand Down Expand Up @@ -576,6 +580,12 @@ else if (second == null)
return Ints.saturatedCast((long)first - (long)second);
}
});

ListIterator<ITweaker> it = tweakers.listIterator();
for (ITweaker tweaker : tweakersArray) {
it.next();
it.set(tweaker);
}
}

public static List<String> getAccessTransformers()
Expand Down