fix #715 prevent NullPointerException with bootstrap classloader

qos-ch · Nov 5, 2023 · 65619bb · 65619bb
1 parent c428711
commit 65619bb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java b/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java
@@ -100,6 +100,10 @@ public void autoConfig(ClassLoader classLoader) throws JoranException {
     }
 
     private Configurator instantiateConfiguratorByClassName(String configuratorClassName, ClassLoader classLoader) {
+        if (classLoader == null) {
+            contextAware.addInfo("Instantiation failure: null ClassLoader");
+            return null;
+        }
         try {
             Class<?> classObj = classLoader.loadClass(configuratorClassName);
             return (Configurator) classObj.getConstructor().newInstance();

diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/util/ContextInitializerTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/util/ContextInitializerTest.java
@@ -122,6 +122,13 @@ public void autoConfigFromServiceLoaderJDK6andAbove() throws Exception {
         assertSame(loggerContext, MockConfigurator.context);
     }
 
+    @Test
+    public void autoConfigFromBootstrapClassLoader() throws Exception {
+        assertNull(MockConfigurator.context);
+        new ContextInitializer(loggerContext).autoConfig(null);
+        assertNull(MockConfigurator.context);
+    }
+
     @Test
     public void autoConfigFromServiceLoaderJDK5() throws Exception {
         assumeTrue(isJDK5());