You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2009/01/31 22:07:27 UTC
svn commit: r739614 -
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java
Author: ivaynberg
Date: Sat Jan 31 21:07:27 2009
New Revision: 739614
URL: http://svn.apache.org/viewvc?rev=739614&view=rev
Log:
WICKET-2048
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java?rev=739614&r1=739613&r2=739614&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java Sat Jan 31 21:07:27 2009
@@ -110,7 +110,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.");
+ }
}
}