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

SelectedValueComparator defensively handles null values in exhaustiveCompare

Browse Source 
Issue: SPR-12001
This commit is contained in:
Juergen Hoeller
2014-07-16 15:11:19 +02:00
parent bad74dc836
commit 980f971236
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -148,7 +148,7 @@ abstract class SelectedValueComparator {
PropertyEditor editor, Map<PropertyEditor, Object> convertedValueCache) { PropertyEditor editor, Map<PropertyEditor, Object> convertedValueCache) {
String candidateDisplayString = ValueFormatter.getDisplayString(candidate, editor, false); String candidateDisplayString = ValueFormatter.getDisplayString(candidate, editor, false);
if (boundValue.getClass().isEnum()) { if (boundValue != null && boundValue.getClass().isEnum()) {
Enum<?> boundEnum = (Enum<?>) boundValue; Enum<?> boundEnum = (Enum<?>) boundValue;
String enumCodeAsString = ObjectUtils.getDisplayString(boundEnum.name()); String enumCodeAsString = ObjectUtils.getDisplayString(boundEnum.name());
if (enumCodeAsString.equals(candidateDisplayString)) { if (enumCodeAsString.equals(candidateDisplayString)) {