diff --git a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java index 06dd448d76..eaf97d9a61 100644 --- a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java +++ b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java @@ -173,10 +173,7 @@ public abstract class ObjectUtils { @Nullable public static Object unwrapOptional(@Nullable Object obj) { if (obj instanceof Optional optional) { - if (optional.isEmpty()) { - return null; - } - Object result = optional.get(); + Object result = optional.orElse(null); Assert.isTrue(!(result instanceof Optional), "Multi-level Optional usage not supported"); return result; }