From a0e1719e8bfeca8d5b617ccb1c01573605bbf35d Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Sun, 11 Sep 2016 21:18:52 -0400 Subject: [PATCH 1/2] Unify handling of throwables when loading class This commit unifies the handling of throwables when attempting to load a class in ThrowableProxy. Now the throwables ClassNotFoundException, NoClassDefFoundError and SecurityException follow the same code path for simplicity. --- .../main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java index e12e14a..e7ef4df 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java @@ -546,10 +546,8 @@ public class ThrowableProxy implements Serializable { } try { clazz = LoaderUtil.loadClass(className); - } catch (final ClassNotFoundException | NoClassDefFoundError e) { + } catch (final ClassNotFoundException | NoClassDefFoundError | SecurityException e) { return loadClass(className); - } catch (final SecurityException e) { - return null; } return clazz; } -- 2.9.3