From 4b13fdaf945adbf566e5ce69372e453079f4f4fe Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 26 Nov 2023 10:42:56 -0500 Subject: [PATCH] Remove code that accounts for Java 1.1 and 1.2 Didn't get quite right in the previous commit --- .../java/org/apache/commons/logging/impl/SimpleLog.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/commons/logging/impl/SimpleLog.java b/src/main/java/org/apache/commons/logging/impl/SimpleLog.java index 4ee0b3b..c731618 100644 --- a/src/main/java/org/apache/commons/logging/impl/SimpleLog.java +++ b/src/main/java/org/apache/commons/logging/impl/SimpleLog.java @@ -173,7 +173,7 @@ public class SimpleLog implements Log, Serializable { // Get the thread context class loader (if there is one) try { classLoader = Thread.currentThread().getContextClassLoader(); - } catch (final SecurityException e) { + } catch (final RuntimeException e) { /** * getContextClassLoader() throws SecurityException when the context class loader isn't an ancestor of the calling class's class loader, or if * security permissions are restricted. @@ -183,7 +183,9 @@ public class SimpleLog implements Log, Serializable { */ // Capture 'e.getTargetException()' exception for details // alternate: log 'e.getTargetException()', and pass back 'e'. - throw new LogConfigurationException("Unexpected SecurityException", e); + if (!(e instanceof SecurityException)) { + throw new LogConfigurationException("Unexpected SecurityException", e); + } } if (classLoader == null) {