root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Allow PropertyEditor conversion as fallback for enums 

Issue: SPR-16082
This commit is contained in:
Juergen Hoeller 2017-10-17 11:49:54 +02:00
parent 3cb38cef2e
commit ef6aef9107
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2017 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.
@ -162,7 +162,8 @@ abstract class SelectedValueComparator {
else if (ObjectUtils.getDisplayString(boundValue).equals(candidateDisplayString)) { else if (ObjectUtils.getDisplayString(boundValue).equals(candidateDisplayString)) {
return true; return true;
} }
else if (editor != null && candidate instanceof String) {
if (editor != null && candidate instanceof String) {
// Try PE-based comparison (PE should *not* be allowed to escape creating thread) // Try PE-based comparison (PE should *not* be allowed to escape creating thread)
String candidateAsString = (String) candidate; String candidateAsString = (String) candidate;
Object candidateAsValue; Object candidateAsValue;