From ef6aef91077901a5ed532ec3e7a55f5e0e554080 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 17 Oct 2017 11:49:54 +0200 Subject: [PATCH] Allow PropertyEditor conversion as fallback for enums Issue: SPR-16082 --- .../web/servlet/tags/form/SelectedValueComparator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java index e0f0ab8605c..61ad0dd858d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java @@ -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"); * 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)) { 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) String candidateAsString = (String) candidate; Object candidateAsValue;