admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify changes made in commit c2d0d292bd

Browse Source 
See gh-36390
This commit is contained in:
Sam Brannen
2026-03-06 13:13:18 +01:00
parent de417beff7
commit 548b2167b0
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java
+5 -6
View File
@@ -297,13 +297,12 @@ public abstract class AbstractTestContextBootstrapper implements TestContextBoot
// Ideally, we should be able to reuse the ContextLoader that was resolved
// in buildDefaultMergedContextConfiguration(); however, since we have been
// informed that some implementations of resolveContextLoader() mutate the
// state of the supplied ContextConfigurationAttributes to detect default
// configuration classes, we need to invoke resolveContextLoader() on the
// completeDefaultConfigAttributesList as well in order not to break such
// custom TestContextBootstrappers.
ContextLoader contextLoader = resolveContextLoader(testClass, completeDefaultConfigAttributesList);
// state of the supplied ContextConfigurationAttributes to register
// configuration classes, we need to supply null for the ContextLoader in
// the invocation of buildMergedContextConfiguration() in order not to break
// such custom TestContextBootstrappers.
MergedContextConfiguration completeMergedConfig = buildMergedContextConfiguration(
testClass, completeDefaultConfigAttributesList, contextLoader, null,
testClass, completeDefaultConfigAttributesList, null, null,
cacheAwareContextLoaderDelegate, false);
if (!Arrays.equals(mergedConfig.getClasses(), completeMergedConfig.getClasses())) {