Fix #5177 - Popup for DateField with msec resolution fails to open after entering...

svn changeset:13664/svn branch:6.4

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDateField.java b/src/com/vaadin/terminal/gwt/client/ui/VDateField.java
index 601be8b04c93dff9c7031ca718a3d95d779e0247..17fe4f93ba80000b70007e8749ecfc79f3ae4abf 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VDateField.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VDateField.java
@@ -58,7 +58,8 @@ public class VDateField extends FlowPanel implements Paintable, Field {
     protected boolean enabled;\r
 \r
     /**\r
-     * The date that is selected in the date field.\r
+     * The date that is selected in the date field. Null if an invalid date is\r
+     * specified.\r
      */\r
     protected Date date = null;\r
     // e.g when paging a calendar, before actually selecting\r
@@ -188,6 +189,10 @@ public class VDateField extends FlowPanel implements Paintable, Field {
     }-*/;\r
 \r
     public int getMilliseconds() {\r
+        if (date == null) {\r
+            return 0;\r
+        }\r
+\r
         return (int) (date.getTime() - date.getTime() / 1000 * 1000);\r
     }\r
 \r