root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x

This commit is contained in:
Phillip Webb 2022-06-10 16:13:35 -07:00
parent beb1c15219 63fdd729f5
commit 7bf82b5349
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ 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,7 +108,7 @@ final class BindConverter {
try {
if (delegate.canConvert(sourceType, targetType)) {
Object converted = delegate.convert(source, sourceType, targetType);
if (targetType.getType().isInstance(converted)) {
if (ClassUtils.isAssignableValue(targetType.getType(), converted)) {
return converted;
}
}

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/WithPublicObjectToObjectMethod.java
View File

@ -40,4 +40,4 @@ public class WithPublicObjectToObjectMethod {
return Optional.of(new WithPublicObjectToObjectMethod(value));
}
}
}