Added a null check to fix #5688

svn changeset:15218/svn branch:6.4

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
index 7507e9f9fa4949d8f8a743f4ab4eaf19c5aa90f8..63a6776394bcfdcbbb5207dbb547473c7f6419ac 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
@@ -73,7 +73,10 @@ public class VDateFieldCalendar extends VDateField {
         if (currentResolution <= RESOLUTION_MONTH) {\r
             calendarPanel.setFocusChangeListener(new FocusChangeListener() {\r
                 public void focusChanged(Date date) {\r
-                    Date date2 = new Date(calendarPanel.getDate().getTime());\r
+                       Date date2 = new Date();\r
+                       if (calendarPanel.getDate() != null) {\r
+                               date2.setTime(calendarPanel.getDate().getTime());\r
+                       }\r
                     /*\r
                      * Update the value of calendarPanel\r
                      */\r