Only cache SRG bytes during the load of that particular class to redu…

…ce dedotated wam usage
MinimallyCorrect · Jan 20, 2017 · 317d314 · 317d314
1 parent 109e619
commit 317d314
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/main/java/me/nallar/modpatcher/LaunchClassLoaderUtil.java b/src/main/java/me/nallar/modpatcher/LaunchClassLoaderUtil.java
@@ -314,4 +314,9 @@ static void removeRedundantExclusions(Set<String> transformerExceptions) {
 			}
 		}
 	}
+
+	public static void releaseSrgBytes(String transformedName) {
+		cachedSrgClasses.remove(transformedName);
+		ModPatcherTransformer.pool.dropCache(transformedName);
+	}
 }
diff --git a/src/main/java/me/nallar/modpatcher/ModPatcherTransformer.java b/src/main/java/me/nallar/modpatcher/ModPatcherTransformer.java
@@ -77,17 +77,21 @@ private static void recursivelyAddXmlFiles(File directory, Patcher patcher) {
 	static byte[] transformationHook(String name, byte[] originalBytes) {
 		LaunchClassLoaderUtil.cacheSrgBytes(name, originalBytes);
 
-		if (mixinApplicator != null) {
-			final byte[] finalOriginalBytes = originalBytes;
-			originalBytes = getMixinApplicator().getMixinTransformer().transformClass(() -> finalOriginalBytes, name).get();
-		}
-
 		try {
-			return patcher.patch(name, originalBytes);
-		} catch (Throwable t) {
-			PatcherLog.error("Failed to patch " + name, t);
+			if (mixinApplicator != null) {
+				final byte[] finalOriginalBytes = originalBytes;
+				originalBytes = getMixinApplicator().getMixinTransformer().transformClass(() -> finalOriginalBytes, name).get();
+			}
+
+			try {
+				return patcher.patch(name, originalBytes);
+			} catch (Throwable t) {
+				PatcherLog.error("Failed to patch " + name, t);
+			}
+			return originalBytes;
+		} finally {
+			LaunchClassLoaderUtil.releaseSrgBytes(name);
 		}
-		return originalBytes;
 	}
 
 	static IClassTransformer getInstance() {