Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.logging.log4j.core.util.Loader;
import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.LoaderUtil;
Expand All @@ -34,7 +35,8 @@
*/
@Deprecated
final class ThrowableProxyHelper {

private static Map<String, Class> className2ClassMap = new ConcurrentHashMap();

private ThrowableProxyHelper() {
// Utility Class
}
Expand Down Expand Up @@ -199,11 +201,15 @@ private static CacheEntry toCacheEntry(final Class<?> callerClass, final boolean
*/
private static Class<?> loadClass(final ClassLoader lastLoader, final String className) {
// XXX: this is overly complicated
Class<?> clazz;
Class<?> clazz = className2ClassMap.get(className);
if (null != clazz) {
return clazz;
}
if (lastLoader != null) {
try {
clazz = lastLoader.loadClass(className);
if (clazz != null) {
className2ClassMap.put(className, clazz);
return clazz;
}
} catch (final Throwable ignore) {
Expand All @@ -213,10 +219,11 @@ private static Class<?> loadClass(final ClassLoader lastLoader, final String cla
try {
clazz = LoaderUtil.loadClass(className);
} catch (final ClassNotFoundException | NoClassDefFoundError e) {
return loadClass(className);
clazz = loadClass(className);
} catch (final SecurityException e) {
return null;
}
className2ClassMap.put(className, clazz);
return clazz;
}

Expand Down
Loading