diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/SpringBootConfigurationFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/SpringBootConfigurationFactory.java index 824b59ffe1..9f7fcb8f91 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/SpringBootConfigurationFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/SpringBootConfigurationFactory.java @@ -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 {