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

Revert BindConverter changes that are now handled by Framework

Browse Source 
See gh-28592 and spring-projects/spring-framework#28609

Closes gh-31343
This commit is contained in:
Andy Wilkinson
2022-06-14 10:37:35 +01:00
parent 2f40c52d81
commit 5d7cab09b8
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindConverter.java
View File

@@ -42,7 +42,6 @@ import org.springframework.core.convert.ConverterNotFoundException;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.ConditionalGenericConverter;
import org.springframework.core.convert.support.GenericConversionService;
import org.springframework.util.ClassUtils;
import org.springframework.util.CollectionUtils;
/**
@@ -107,10 +106,7 @@ final class BindConverter {
for (ConversionService delegate : this.delegates) {
try {
if (delegate.canConvert(sourceType, targetType)) {
Object converted = delegate.convert(source, sourceType, targetType);
if (ClassUtils.isAssignableValue(targetType.getType(), converted)) {
return converted;
}
return delegate.convert(source, sourceType, targetType);
}
}
catch (ConversionException ex) {