root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '3.4.x' 

Closes gh-44474
This commit is contained in:
Moritz Halbritter 2025-02-28 10:23:00 +01:00
parent 278c37d6e1 589bf2cafc
commit 92e18df7f0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
View File

@ -17,6 +17,7 @@
package org.springframework.boot.logging.log4j2; package org.springframework.boot.logging.log4j2;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.util.ArrayList; import java.util.ArrayList;
@ -284,13 +285,11 @@ public class Log4J2LoggingSystem extends AbstractLoggingSystem {
private Configuration load(String location, LoggerContext context) throws IOException { private Configuration load(String location, LoggerContext context) throws IOException {
Resource resource = ApplicationResourceLoader.get().getResource(location); Resource resource = ApplicationResourceLoader.get().getResource(location);
ConfigurationSource source = getConfigurationSource(resource); ConfigurationFactory factory = ConfigurationFactory.getInstance();
return ConfigurationFactory.getInstance().getConfiguration(context, source);
}
private ConfigurationSource getConfigurationSource(Resource resource) throws IOException {
if (resource.isFile()) { if (resource.isFile()) {
return new ConfigurationSource(resource.getInputStream(), resource.getFile()); try (InputStream inputStream = resource.getInputStream()) {
return factory.getConfiguration(context, new ConfigurationSource(inputStream, resource.getFile()));
}
} }
URL url = resource.getURL(); URL url = resource.getURL();
AuthorizationProvider authorizationProvider = ConfigurationFactory AuthorizationProvider authorizationProvider = ConfigurationFactory
@ -299,7 +298,10 @@ public class Log4J2LoggingSystem extends AbstractLoggingSystem {
? SslConfigurationFactory.getSslConfiguration() : null; ? SslConfigurationFactory.getSslConfiguration() : null;
URLConnection connection = UrlConnectionFactory.createConnection(url, 0, sslConfiguration, URLConnection connection = UrlConnectionFactory.createConnection(url, 0, sslConfiguration,
authorizationProvider); authorizationProvider);
return new ConfigurationSource(connection.getInputStream(), url, connection.getLastModified()); try (InputStream inputStream = connection.getInputStream()) {
return factory.getConfiguration(context,
new ConfigurationSource(inputStream, url, connection.getLastModified()));
}
} }
private CompositeConfiguration createComposite(List<Configuration> configurations) { private CompositeConfiguration createComposite(List<Configuration> configurations) {