Skip to content

S
spring-boot
Commit 177152e0 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.4.x' 

Closes gh-26155
parents 221f36ba aa9d0bc4
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocationResolvers.java
View file @ 177152e0
...@@ -53,8 +53,8 @@ class ConfigDataLocationResolvers { ...@@ -53,8 +53,8 @@ class ConfigDataLocationResolvers {
*/ */
ConfigDataLocationResolvers(DeferredLogFactory logFactory, ConfigurableBootstrapContext bootstrapContext, ConfigDataLocationResolvers(DeferredLogFactory logFactory, ConfigurableBootstrapContext bootstrapContext,
Binder binder, ResourceLoader resourceLoader) { Binder binder, ResourceLoader resourceLoader) {
this(logFactory, bootstrapContext, binder, resourceLoader, this(logFactory, bootstrapContext, binder, resourceLoader, SpringFactoriesLoader
SpringFactoriesLoader.loadFactoryNames(ConfigDataLocationResolver.class, null)); .loadFactoryNames(ConfigDataLocationResolver.class, ConfigDataLocationResolver.class.getClassLoader()));
} }
/** /**
......
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