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

Merge branch '6.2.x'

Browse Source
This commit is contained in:
Sam Brannen
2025-10-15 11:30:31 +02:00
parent 04ae53d6bb 1612b7c5db
commit 3493fc9324
3 changed files with 61 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
+7 -1
View File
@@ -120,7 +120,13 @@ class ConfigurationClassBeanDefinitionReader {
public void loadBeanDefinitions(Set<ConfigurationClass> configurationModel) {
TrackedConditionEvaluator trackedConditionEvaluator = new TrackedConditionEvaluator();
for (ConfigurationClass configClass : configurationModel) {
loadBeanDefinitionsForConfigurationClass(configClass, trackedConditionEvaluator);
try {
loadBeanDefinitionsForConfigurationClass(configClass, trackedConditionEvaluator);
}
catch (Exception ex) {
throw new IllegalStateException("Failed to load bean definitions for configuration class '" +
configClass.getMetadata().getClassName() + "'", ex);
}
}
}