Skip to content

Commit bab9071

Browse files
committed
Revert "Work around Spring Framework cache pollution bug"
This reverts commit 4af0ee2. Closes gh-45984
1 parent f6c8884 commit bab9071

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2025 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -480,7 +480,7 @@ private <T> List<T> getSpringFactoriesInstances(Class<T> type) {
480480
}
481481

482482
private <T> List<T> getSpringFactoriesInstances(Class<T> type, ArgumentResolver argumentResolver) {
483-
return SpringFactoriesLoader.forDefaultResourceLocation(getClassLoader(null)).load(type, argumentResolver);
483+
return SpringFactoriesLoader.forDefaultResourceLocation(getClassLoader()).load(type, argumentResolver);
484484
}
485485

486486
private ConfigurableEnvironment getOrCreateEnvironment() {
@@ -715,11 +715,10 @@ public ResourceLoader getResourceLoader() {
715715
* @return a ClassLoader (never null)
716716
*/
717717
public ClassLoader getClassLoader() {
718-
return getClassLoader(ClassUtils.getDefaultClassLoader());
719-
}
720-
721-
private ClassLoader getClassLoader(ClassLoader fallback) {
722-
return (this.resourceLoader != null) ? this.resourceLoader.getClassLoader() : fallback;
718+
if (this.resourceLoader != null) {
719+
return this.resourceLoader.getClassLoader();
720+
}
721+
return ClassUtils.getDefaultClassLoader();
723722
}
724723

725724
/**

0 commit comments

Comments
 (0)