From f6d844378175c8f68d79922d6e60d1092017d8ce Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Mon, 29 Jan 2024 16:07:44 +0100 Subject: [PATCH] Fix logic in SupplierUtils --- .../java/org/springframework/util/function/SupplierUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-core/src/main/java/org/springframework/util/function/SupplierUtils.java b/spring-core/src/main/java/org/springframework/util/function/SupplierUtils.java index 6772ec543a..af97e2fd99 100644 --- a/spring-core/src/main/java/org/springframework/util/function/SupplierUtils.java +++ b/spring-core/src/main/java/org/springframework/util/function/SupplierUtils.java @@ -49,7 +49,7 @@ public abstract class SupplierUtils { */ @Nullable public static Object resolve(@Nullable Object candidate) { - return (candidate instanceof Supplier supplier ? supplier.get() : null); + return (candidate instanceof Supplier supplier ? supplier.get() : candidate); } }