Author: ivaynberg
Date: Fri Apr 27 13:47:43 2007
New Revision: 533221
URL: http://svn.apache.org/viewvc?view=rev&rev=533221
Log:
since john removed the check for empty strings from formcomponent.convert()
this is broken. the check was removed to converters can decide how to convert
an empty string to the object instead of formcomponent.convert() always
returning null. but this pushed the check into converters which havent been
updated. bad john! bad!
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/DateConverter.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/DateConverter.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/DateConverter.java?view=diff&rev=533221&r1=533220&r2=533221
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/DateConverter.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/convert/converters/DateConverter.java
Fri Apr 27 13:47:43 2007
@@ -20,6 +20,8 @@
import java.util.Date;
import java.util.Locale;
+import org.apache.wicket.util.string.Strings;
+
/**
* Converts from Object to Date.
*
@@ -34,7 +36,14 @@
*/
public Object convertToObject(final String value, Locale locale)
{
- return parse(getDateFormat(locale), value, locale);
+ if (value == null || Strings.isEmpty(value))
+ {
+ return null;
+ }
+ else
+ {
+ return parse(getDateFormat(locale), value, locale);
+ }
}
/**
