fix shade in cli being broken, make module's cached by classloader

unimined · Aug 1, 2024 · b5a31bd · b5a31bd
1 parent 6b89a42
commit b5a31bd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Class.java b/java-api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_Class.java
@@ -4,7 +4,12 @@
 import xyz.wagyourtail.jvmdg.version.Ref;
 import xyz.wagyourtail.jvmdg.version.Stub;
 
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
+
 public class J_L_Class {
+    private static final Map<ClassLoader, J_L_Module> moduleCache = Collections.synchronizedMap(new WeakHashMap<>());
 
     @Stub(ref = @Ref("Ljava/lang/Class;"))
     public static Class<?> forName(J_L_Module module, String name) throws ClassNotFoundException {
@@ -13,7 +18,13 @@ public static Class<?> forName(J_L_Module module, String name) throws ClassNotFo
 
     @Stub
     public static J_L_Module getModule(Class<?> clazz) {
-        return new J_L_Module(clazz.getClassLoader());
+        ClassLoader loader = clazz.getClassLoader();
+        J_L_Module module = moduleCache.get(loader);
+        if (module == null) {
+            module = new J_L_Module(loader);
+            moduleCache.put(loader, module);
+        }
+        return module;
     }
 
     @Stub

diff --git a/src/main/java/xyz/wagyourtail/jvmdg/compile/ApiShader.java b/src/main/java/xyz/wagyourtail/jvmdg/compile/ApiShader.java
@@ -89,8 +89,8 @@ public static void shadeApis(Flags flags, List<String> prefix, List<Path> inputR
         Set<Path> downgradedApiPath = resolveDowngradedApi(flags, downgradedApi);
         List<FileSystem> apiFs = new ArrayList<>();
         try {
-            for (File file : downgradedApi) {
-                apiFs.add(Utils.openZipFileSystem(file.toPath(), false));
+            for (Path file : downgradedApiPath) {
+                apiFs.add(Utils.openZipFileSystem(file, false));
             }
             List<Path> apiRoots = new ArrayList<>();
             for (FileSystem fs : apiFs) {