Skip to content

Commit ec84fa6

Browse files
committed
ObjectToOptionalConverter uses Optional.ofNullable after ConversionService invocation
Issue: SPR-12589
1 parent 6790f55 commit ec84fa6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

spring-core/src/main/java/org/springframework/core/convert/support/ObjectToOptionalConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
6969
}
7070
else {
7171
Object target = this.conversionService.convert(source, sourceType, new GenericTypeDescriptor(targetType));
72-
return Optional.of(target);
72+
return Optional.ofNullable(target);
7373
}
7474
}
7575

0 commit comments

Comments
 (0)