Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

Browse Source 
Closes gh-42624
This commit is contained in:
Moritz Halbritter
2024-10-14 11:00:27 +02:00
parent 3c6e3c14a8 2e3244acae
commit 8a783dfdc7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinder.java
View File

@@ -156,7 +156,7 @@ class ConfigurationPropertiesBinder {
return (value instanceof Validator validator) ? validator : null;
}
Class<?> type = target.getType().resolve();
if (Validator.class.isAssignableFrom(type)) {
if (type != null && Validator.class.isAssignableFrom(type)) {
return new SelfValidatingConstructorBoundBindableValidator(type);
}
return null;
@@ -208,7 +208,7 @@ class ConfigurationPropertiesBinder {
.rootBeanDefinition(ConfigurationPropertiesBinderFactory.class)
.getBeanDefinition();
definition.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
registry.registerBeanDefinition(ConfigurationPropertiesBinder.BEAN_NAME, definition);
registry.registerBeanDefinition(BEAN_NAME, definition);
}
}