From ed665a12a32b8ad1dcdd8fc4549bae3ed7a1074d Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Fri, 2 Jan 2015 14:57:42 +0100
Subject: [PATCH] ObjectToOptionalConverter uses Optional.ofNullable after
 ConversionService invocation

Issue: SPR-12589
(cherry picked from commit ec84fa6)
---
 .../core/convert/support/ObjectToOptionalConverter.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToOptionalConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToOptionalConverter.java
index 67d2ce1869..824a691b56 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToOptionalConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToOptionalConverter.java
@@ -69,7 +69,7 @@ final class ObjectToOptionalConverter implements ConditionalGenericConverter {
 		}
 		else {
 			Object target = this.conversionService.convert(source, sourceType, new GenericTypeDescriptor(targetType));
-			return Optional.of(target);
+			return Optional.ofNullable(target);
 		}
 	}