CallingClassUtils: replace Class.forName() with Context.getClassLoader()

maarzt · maarzt · commit b80f6fe18be6 · 2020-12-09T14:24:03.000+01:00
Class.forName() will fail if the threads class loader is not set.
diff --git a/src/main/java/org/scijava/log/CallingClassUtils.java b/src/main/java/org/scijava/log/CallingClassUtils.java
@@ -29,6 +29,8 @@
 
 package org.scijava.log;
 
+import org.scijava.Context;
+
 /**
  * Utility class for getting the calling class of a method.
  *
@@ -60,7 +62,7 @@ public static String getCallingClassName() {
 
 	private static boolean hasIgnoreAsCallingClassAnnotation(String className) {
 		try {
-			Class< ? > clazz = Class.forName(className);
+			Class< ? > clazz = Context.getClassLoader().loadClass(className);
 			return clazz.isAnnotationPresent(IgnoreAsCallingClass.class);
 		}
 		catch (ClassNotFoundException ignore) {

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@`
`29`	`29`
`30`	`30`	`package org.scijava.log;`
`31`	`31`
	`32`	`+import org.scijava.Context;`
	`33`	`+`
`32`	`34`	`/**`
`33`	`35`	`* Utility class for getting the calling class of a method.`
`34`	`36`	`*`
`@@ -60,7 +62,7 @@ public static String getCallingClassName() {`
`60`	`62`
`61`	`63`	`private static boolean hasIgnoreAsCallingClassAnnotation(String className) {`
`62`	`64`	`try {`
`63`		`- Class< ? > clazz = Class.forName(className);`
	`65`	`+ Class< ? > clazz = Context.getClassLoader().loadClass(className);`
`64`	`66`	`return clazz.isAnnotationPresent(IgnoreAsCallingClass.class);`
`65`	`67`	`}`
`66`	`68`	`catch (ClassNotFoundException ignore) {`