Fixed the weirdest bug on OpenJDK, preventing some classes from loadi…

…ng seemingly randomly
Hugobros3 · Nov 2, 2017 · 7dc329d · 7dc329d
1 parent b30996a
commit 7dc329d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/common/src/main/java/io/xol/chunkstories/content/mods/ForeignCodeClassLoader.java b/common/src/main/java/io/xol/chunkstories/content/mods/ForeignCodeClassLoader.java
@@ -59,7 +59,12 @@ public ForeignCodeClassLoader(Mod responsibleMod, ClassLoader parentLoader, Coll
 
 						try
 						{
-							Class<?> loadedClass = this.findClass(className);
+							//OpenJDK weirdness: Unlike Oracle's implementation, OpenJDK loads the referenced classes when it loads one
+							//meaning when I call findClass() on every .class I end up with duplicate findClass() calls, and it doesn't like it very much
+
+							//The fix is easy: call findLoadedClass() first and check we're not duplicating the request
+							Class<?> alreadyLoadedClass = this.findLoadedClass(className);
+							Class<?> loadedClass = alreadyLoadedClass != null ? alreadyLoadedClass : this.findClass(className);
 							classes.put(className, loadedClass);
 						}
 						catch (ClassNotFoundException e1)
@@ -71,6 +76,7 @@ public ForeignCodeClassLoader(Mod responsibleMod, ClassLoader parentLoader, Coll
 						}
 						catch(LinkageError le)
 						{
+							System.out.println("This should not happen!");
 							//Don't care
 						}
 						//classes.add(className);

diff --git a/debug-client.sh b/debug-client.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -d64 -Xmx1200M -Xdebug -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Xrunjdwp:transport=dt_socket,address=7724,server=y,suspend=n -jar client/build/libs/chunkstories.jar --dir="."
+java -d64 -Xmx1200M -Xdebug -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Xrunjdwp:transport=dt_socket,address=7724,server=y,suspend=n -jar client/build/libs/chunkstories.jar --dir="." --core="../chunkstories-core/res/"