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/08/19 02:25:32 UTC

svn commit: r567344 - /wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java

Author: ehillenius
Date: Sat Aug 18 17:25:31 2007
New Revision: 567344

URL: http://svn.apache.org/viewvc?view=rev&rev=567344
Log:
don't set anything when parsing fails of the date time field comp

Modified:
    wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java

Modified: wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java?view=diff&rev=567344&r1=567343&r2=567344
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java (original)
+++ wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java Sat Aug 18 17:25:31 2007
@@ -259,7 +259,6 @@
 	 */
 	protected void convertInput()
 	{
-		Object convertedInput = null;
 		Object dateFieldInput = dateField.getConvertedInput();
 		if (dateFieldInput != null)
 		{
@@ -291,7 +290,7 @@
 				}
 
 				// the date will be in the server's timezone
-				convertedInput = date.toDate();
+				setConvertedInput(date.toDate());
 			}
 			catch (RuntimeException e)
 			{
@@ -299,8 +298,10 @@
 				invalid();
 			}
 		}
-
-		setConvertedInput(convertedInput);
+		else
+		{
+			setConvertedInput(null);
+		}
 	}
 
 	/**