Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Protect against NPE caused by recursive calls

Browse Source 
Update `SpringBootConfigurationFactory` so that it no longer attempts
to get a `LoggingSystem`.

The recent `LoggingSystem` update means makes use of the
`SpringFactoriesLoader` class to load candidate logging systems.
Unfortunately, the `SpringFactoriesLoader` class creates a `Logger`
which (when using Log4J2) causes `SpringBootConfigurationFactory` to
run. Calling `LoggingSystem.get` from `SpringBootConfigurationFactory`
results in a recursive call to `SpringFactoriesLoader` which hasn't
yet been fully initialized. We then see an NPE caused by a `null`
`cache`.

This update removes the call to `LoggingSystem.get` with the assumption
that it would never return `null` anyway.

Fixes gh-24163
This commit is contained in:
Phillip Webb
2020-11-17 17:07:28 -08:00
parent 33499674e7
commit 0ce3e7ec6b
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/SpringBootConfigurationFactory.java
View File

@@ -24,8 +24,6 @@ import org.apache.logging.log4j.core.config.DefaultConfiguration;
import org.apache.logging.log4j.core.config.Order;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.springframework.boot.logging.LoggingSystem;
/**
* Spring Boot {@link ConfigurationFactory} that customizes Log4J2's default configuration
* to:
@@ -56,11 +54,10 @@ public class SpringBootConfigurationFactory extends ConfigurationFactory {
@Override
public Configuration getConfiguration(LoggerContext loggerContext, ConfigurationSource source) {
if (source != null && source != ConfigurationSource.NULL_SOURCE
&& LoggingSystem.get(loggerContext.getClass().getClassLoader()) != null) {
return new SpringBootConfiguration();
if (source == null || source == ConfigurationSource.NULL_SOURCE) {
return null;
}
return null;
return new SpringBootConfiguration();
}
private static final class SpringBootConfiguration extends DefaultConfiguration {