spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-21 13:31:46 +00:00
Code Issues Projects Releases Wiki Activity

refined PropertyEditor exposure for the ConversionService case

Browse Source 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2670 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Juergen Hoeller
2009-12-15 11:34:19 +00:00
parent c4d1940d06
commit 95d1eccd65
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java
+6 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2007 the original author or authors.
* Copyright 2002-2009 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.
@@ -59,16 +59,16 @@ abstract class ValueFormatter {
if (propertyEditor != null && !(value instanceof String)) {
try {
propertyEditor.setValue(value);
return getDisplayString(propertyEditor.getAsText(), htmlEscape);
String text = propertyEditor.getAsText();
if (text != null) {
return getDisplayString(text, htmlEscape);
}
}
catch (Throwable ex) {
// The PropertyEditor might not support this value... pass through.
return getDisplayString(value, htmlEscape);
}
}
else {
return getDisplayString(value, htmlEscape);
}
return getDisplayString(value, htmlEscape);
}
}