重命名+fix

Viola-Siemens · Feb 16, 2025 · da3240f · da3240f
1 parent 1fa35fe
commit da3240f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/main/java/com/hexagram2021/cme_suck_my_duck/CMESuckMyDuck.java b/src/main/java/com/hexagram2021/cme_suck_my_duck/CMESuckMyDuck.java
@@ -53,24 +53,23 @@ public static void premain(String agentArg, Instrumentation inst) {
 			logger.error(e);
 		}
 
+		String[] args = agentArg.split(";");
 		if(INJECT_METHOD) {
-			String[] args = agentArg.split(";");
 			if (args.length < 2) {
 				logger.error("Failed to parse agent arguments. Expect 2 arguments, found %d: [%s].", args.length, Log.buildArrayString(args));
 				return;
 			}
 			inst.addTransformer(new InjectLogTransformer(args[0], args[1]), true);
-			logger.info("Successfully added transformer for %s of class %s, type %s, phase %s.", args[1], args[0], args[2], args[3]);
+			logger.info("Successfully added transformer for method %s of class %s.", args[1], args[0]);
 		} else {
 			//Parse
-			String[] args = agentArg.split(";");
 			if (args.length < 4) {
 				logger.error("Failed to parse agent arguments. Expect 4 arguments, found %d: [%s].", args.length, Log.buildArrayString(args));
 				return;
 			}
 			//Main
 			inst.addTransformer(new WrapContainerTransformer(args[0], args[1], Type.fromName(args[2]), Phase.fromName(args[3])), true);
-			logger.info("Successfully added transformer for %s of class %s, type %s, phase %s.", args[1], args[0], args[2], args[3]);
+			logger.info("Successfully added transformer for field %s of class %s, type %s, phase %s.", args[1], args[0], args[2], args[3]);
 		}
 	}
 

diff --git a/src/main/java/com/hexagram2021/cme_suck_my_duck/containers/Containers.java b/src/main/java/com/hexagram2021/cme_suck_my_duck/containers/Containers.java
@@ -15,12 +15,12 @@
 @SuppressWarnings("unchecked")
 public final class Containers {
 	public static final Log logger;
-	private static final boolean fix;
+	private static final boolean transformToThreadSafe;
 
 	public static <T> List<T> newWrappedList(Object wrapped) {
 		try {
 			if(Log.canWrap()) {
-				if(fix) {
+				if(transformToThreadSafe) {
 					return new CopyOnWriteArrayList<>((List<T>) wrapped);
 				}
 				return new WrappedList<>((List<T>) wrapped);
@@ -34,7 +34,7 @@ public static <T> List<T> newWrappedList(Object wrapped) {
 	public static <T> Set<T> newWrappedSet(Object wrapped) {
 		try {
 			if(Log.canWrap()) {
-				if(fix) {
+				if(transformToThreadSafe) {
 					Set<T> ret = ConcurrentHashMap.newKeySet();
 					ret.addAll((Set<T>) wrapped);
 					return ret;
@@ -50,7 +50,7 @@ public static <T> Set<T> newWrappedSet(Object wrapped) {
 	public static <K, V> Map<K, V> newWrappedMap(Object wrapped) {
 		try {
 			if(Log.canWrap()) {
-				if(fix) {
+				if(transformToThreadSafe) {
 					return new ConcurrentHashMap<>((Map<K, V>) wrapped);
 				}
 				return new WrappedMap<>((Map<K, V>) wrapped);
@@ -73,9 +73,9 @@ private Containers() {
 		}
 		boolean fixConcurrent = false;
 		try {
-			fixConcurrent = Boolean.parseBoolean(System.getProperty("cme_suck_my_duck.fix"));
+			fixConcurrent = Boolean.parseBoolean(System.getProperty("cme_suck_my_duck.transform_to_thread_safe"));
 		} catch (Exception ignored) {
 		}
-		fix = fixConcurrent;
+		transformToThreadSafe = fixConcurrent;
 	}
 }