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 69d6108152a7cb16ab26546f1c41415e90b37efd..789ae06b48596851c6389a54ace67b4954ba7dc1 100644 (file)
--- 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));
             }
         }
     }