Merge branch '2.4.x'

Closes gh-26155
This commit is contained in:
Andy Wilkinson 2021-04-19 10:24:25 +01:00
commit 177152e007

View File

@ -53,8 +53,8 @@ class ConfigDataLocationResolvers {
*/
ConfigDataLocationResolvers(DeferredLogFactory logFactory, ConfigurableBootstrapContext bootstrapContext,
Binder binder, ResourceLoader resourceLoader) {
this(logFactory, bootstrapContext, binder, resourceLoader,
SpringFactoriesLoader.loadFactoryNames(ConfigDataLocationResolver.class, null));
this(logFactory, bootstrapContext, binder, resourceLoader, SpringFactoriesLoader
.loadFactoryNames(ConfigDataLocationResolver.class, ConfigDataLocationResolver.class.getClassLoader()));
}
/**