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

Merge branch '2.4.x' 

Closes gh-26155
This commit is contained in:
Andy Wilkinson 2021-04-19 10:24:25 +01:00
parent 221f36ba93 aa9d0bc421
commit 177152e007
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocationResolvers.java
View File

@ -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()));
} }
/** /**