From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 4 Nov 2009 12:13:33 +0000 (+0000)
Subject: merged [9621] from 6.1
X-Git-Tag: 6.7.0.beta1~2336
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=821a8cbc916b9110fbbc96f2b78fbedc4f6a484b;p=vaadin-framework.git

merged [9621] from 6.1

svn changeset:9622/svn branch:6.2
---

diff --git a/src/com/vaadin/ui/DateField.java b/src/com/vaadin/ui/DateField.java
index 69d6108152..789ae06b48 100644
--- a/src/com/vaadin/ui/DateField.java
+++ b/src/com/vaadin/ui/DateField.java
@@ -332,13 +332,13 @@ public class DateField extends AbstractField {
                 newDate = cal.getTime();
             }
 
-            if (newDate != oldDate
+            if (newDate == null && dateString != null && !"".equals(dateString)
+                    && !dateString.equals(oldDateString)) {
+                setValue(handleUnparsableDateString(dateString));
+            } else if (newDate != oldDate
                     && (newDate == null || !newDate.equals(oldDate))) {
                 setValue(newDate, true); // Don't require a repaint, client
                 // updates itself
-            } else if (dateString != null && !"".equals(dateString)
-                    && !dateString.equals(oldDateString)) {
-                setValue(handleUnparsableDateString(dateString));
             }
         }
     }