Skip to content

S
spring-boot
Commit 76c4a38e authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.3.x'

parents 0ea26268 02e989c8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
View file @ 76c4a38e
...@@ -58,6 +58,8 @@ import org.springframework.util.StringUtils; ...@@ -58,6 +58,8 @@ import org.springframework.util.StringUtils;
*/ */
public class Log4J2LoggingSystem extends Slf4JLoggingSystem { public class Log4J2LoggingSystem extends Slf4JLoggingSystem {
private static final String FILE_PROTOCOL = "file";
private static final Map<LogLevel, Level> LEVELS; private static final Map<LogLevel, Level> LEVELS;
static { static {
...@@ -172,7 +174,7 @@ public class Log4J2LoggingSystem extends Slf4JLoggingSystem { ...@@ -172,7 +174,7 @@ public class Log4J2LoggingSystem extends Slf4JLoggingSystem {
private ConfigurationSource getConfigurationSource(URL url) throws IOException { private ConfigurationSource getConfigurationSource(URL url) throws IOException {
InputStream stream = url.openStream(); InputStream stream = url.openStream();
if (ResourceUtils.isFileURL(url)) { if (FILE_PROTOCOL.equals(url.getProtocol())) {
return new ConfigurationSource(stream, ResourceUtils.getFile(url)); return new ConfigurationSource(stream, ResourceUtils.getFile(url));
} }
return new ConfigurationSource(stream, url); return new ConfigurationSource(stream, url);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment