Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Defensively check javaUtilOptionalEmpty

Browse Source 
Issue: SPR-11888
This commit is contained in:
Juergen Hoeller
2014-06-19 21:25:46 +02:00
parent bc1f19ce18
commit ab5aea5a13
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
View File

@@ -59,9 +59,6 @@ import org.springframework.util.StringUtils;
*/
public class GenericConversionService implements ConfigurableConversionService {
/** Java 8's java.util.Optional.empty() */
private static Object javaUtilOptionalEmpty = null;
/**
* General NO-OP converter used when conversion is not required.
*/
@@ -73,11 +70,16 @@ public class GenericConversionService implements ConfigurableConversionService {
*/
private static final GenericConverter NO_MATCH = new NoOpConverter("NO_MATCH");
/** Java 8's java.util.Optional.empty() */
private static Object javaUtilOptionalEmpty = null;
static {
try {
Class<?> clazz = ClassUtils.forName("java.util.Optional", GenericConversionService.class.getClassLoader());
javaUtilOptionalEmpty = ClassUtils.getMethod(clazz, "empty").invoke(null);
} catch (Exception ex) {
}
catch (Exception ex) {
// Java 8 not available - conversion to Optional not supported then.
}
}
@@ -225,7 +227,7 @@ public class GenericConversionService implements ConfigurableConversionService {
* @return the converted null object
*/
protected Object convertNullSource(TypeDescriptor sourceType, TypeDescriptor targetType) {
if (targetType.getObjectType().equals(javaUtilOptionalEmpty.getClass())) {
if (javaUtilOptionalEmpty != null && targetType.getObjectType().equals(javaUtilOptionalEmpty.getClass())) {
return javaUtilOptionalEmpty;
}
return null;