Merge branch '3.4.x'

wilkinsona · wilkinsona · commit 4ffb29a92428 · 2025-02-26T15:42:58.000Z
Closes gh-44451
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataLocationResolver.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataLocationResolver.java
@@ -87,7 +87,7 @@ public StandardConfigDataLocationResolver(DeferredLogFactory logFactory, Binder
 			ResourceLoader resourceLoader) {
 		this.logger = logFactory.getLog(StandardConfigDataLocationResolver.class);
 		this.propertySourceLoaders = SpringFactoriesLoader.loadFactories(PropertySourceLoader.class,
-				getClass().getClassLoader());
+				resourceLoader.getClassLoader());
 		this.configNames = getConfigNames(binder);
 		this.resourceLoader = new LocationResourceLoader(resourceLoader);
 	}

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public StandardConfigDataLocationResolver(DeferredLogFactory logFactory, Binder`
`87`	`87`	`ResourceLoader resourceLoader) {`
`88`	`88`	`this.logger = logFactory.getLog(StandardConfigDataLocationResolver.class);`
`89`	`89`	`this.propertySourceLoaders = SpringFactoriesLoader.loadFactories(PropertySourceLoader.class,`
`90`		`- getClass().getClassLoader());`
	`90`	`+ resourceLoader.getClassLoader());`
`91`	`91`	`this.configNames = getConfigNames(binder);`
`92`	`92`	`this.resourceLoader = new LocationResourceLoader(resourceLoader);`
`93`	`93`	`}`