Author: ivaynberg
Date: Sat Jan 31 21:07:04 2009
New Revision: 739613
URL: http://svn.apache.org/viewvc?rev=739613&view=rev
Log:
WICKET-2041
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java?rev=739613&r1=739612&r2=739613&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java
Sat Jan 31 21:07:04 2009
@@ -124,7 +124,25 @@
return "";
}
- return (String)Objects.convertValue(value,
String.class);
+ final Object converted = Objects.convertValue(value,
String.class);
+ if (converted == null)
+ {
+ // object was converted to null
+ return "";
+ }
+ else if (converted instanceof String)
+ {
+ // object was successfully converted to a string
+ return (String)converted;
+ }
+ else
+ {
+ // object could not be converted to a string,
hardcast to string
+ throw new ConversionException("Could not
convert object of type: " +
+ value.getClass() + " to string.
Possible its #toString() returned null. " +
+ "Either install a custom converter (see
IConverterLocator) or " +
+ "override #toString() to return a
non-null value.");
+ }
}
}
