svn commit: r739615 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/ConverterLocator.java

[iv...@apache.org]

Author: ivaynberg
Date: Sat Jan 31 21:09:33 2009
New Revision: 739615

URL: http://svn.apache.org/viewvc?rev=739615&view=rev
Log:
WICKET-2041: cleaned up

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=739615&r1=739614&r2=739615&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:09:33 2009
@@ -124,24 +124,17 @@
 				return "";
 			}
 
-			final Object converted = Objects.convertValue(value, String.class);
-			if (converted == null)
+			try
 			{
-				// object was converted to null
-				return "";
-			}
-			else if (converted instanceof String)
-			{
-				// object was successfully converted to a string
-				return (String)converted;
+				return (String)Objects.convertValue(value, String.class);
 			}
-			else
+			catch (Exception e)
 			{
-				// 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.");
+					"override #toString() to return a non-null value.").setSourceValue(value)
+					.setConverter(this);
 			}
 		}
 	}