You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/11/07 06:38:56 UTC
svn commit: r592617 -
/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractNumberConverter.java
Author: ehillenius
Date: Tue Nov 6 21:38:56 2007
New Revision: 592617
URL: http://svn.apache.org/viewvc?rev=592617&view=rev
Log:
AbstractConverter: return null when value is null
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractNumberConverter.java
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractNumberConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractNumberConverter.java?rev=592617&r1=592616&r2=592617&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractNumberConverter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/AbstractNumberConverter.java Tue Nov 6 21:38:56 2007
@@ -64,7 +64,11 @@
final NumberFormat numberFormat = getNumberFormat(locale);
- if (value instanceof String)
+ if (value == null)
+ {
+ return null;
+ }
+ else if (value instanceof String)
{
// Convert spaces to no-break space (U+00A0) to fix problems with
// browser conversions.
@@ -82,14 +86,14 @@
if (number.doubleValue() < min)
{
- throw newConversionException("Value cannot be less than " + min, value, locale)
- .setFormat(numberFormat);
+ throw newConversionException("Value cannot be less than " + min, value, locale).setFormat(
+ numberFormat);
}
if (number.doubleValue() > max)
{
- throw newConversionException("Value cannot be greater than " + max, value, locale)
- .setFormat(numberFormat);
+ throw newConversionException("Value cannot be greater than " + max, value, locale).setFormat(
+ numberFormat);
}
return number;