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

svn changeset:13664/svn branch:6.4

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDateField.java b/src/com/vaadin/terminal/gwt/client/ui/VDateField.java
index 601be8b04c..17fe4f93ba 100644
--- 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;

 

     /**

-     * The date that is selected in the date field.

+     * The date that is selected in the date field. Null if an invalid date is

+     * specified.

      */

     protected Date date = null;

     // e.g when paging a calendar, before actually selecting

@@ -188,6 +189,10 @@ public class VDateField extends FlowPanel implements Paintable, Field {
     }-*/;

 

     public int getMilliseconds() {

+        if (date == null) {

+            return 0;

+        }

+

         return (int) (date.getTime() - date.getTime() / 1000 * 1000);

     }