Fix log spam due to dropCache warning

MinimallyCorrect · Jan 20, 2017 · b0d0783 · b0d0783
1 parent 503eaf0
commit b0d0783
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/javassist/ClassLoaderPool.java b/src/main/java/javassist/ClassLoaderPool.java
@@ -72,8 +72,8 @@ void writeClassfile(String className, OutputStream out) throws NotFoundException
 		}
 	}
 
-	public void dropCache(String name) {
-		if (classes.remove(name) == null) {
+	public void dropCache(String name, boolean allowFailure) {
+		if (classes.remove(name) == null && !allowFailure) {
 			// TODO: Should be behind a system property? Could be very spammy
 			PatcherLog.warn("Failed to drop " + name + " from cache. Currently cached: " + classes.keySet().toString());
 		}

diff --git a/src/main/java/me/nallar/modpatcher/LaunchClassLoaderUtil.java b/src/main/java/me/nallar/modpatcher/LaunchClassLoaderUtil.java
@@ -256,7 +256,7 @@ public static void cacheSrgBytes(String transformedName, byte[] bytes) {
 
 		byte[] old = cachedSrgClasses.put(transformedName, bytes);
 		if (old != null && !Arrays.equals(bytes, old)) {
-			ModPatcherTransformer.pool.dropCache(transformedName);
+			ModPatcherTransformer.pool.dropCache(transformedName, false);
 			if (shouldWarnInconsistentTransformation())
 				PatcherLog.warn(null, new Error("Inconsistent transformation results. Tried to cache different bytes for class " + transformedName + " to previous result after transformation."));
 		}
@@ -317,6 +317,6 @@ static void removeRedundantExclusions(Set<String> transformerExceptions) {
 
 	public static void releaseSrgBytes(String transformedName) {
 		cachedSrgClasses.remove(transformedName);
-		ModPatcherTransformer.pool.dropCache(transformedName);
+		ModPatcherTransformer.pool.dropCache(transformedName, true);
 	}
 }