From: Jonatan Kronqvist <jonatan.kronqvist@itmill.com>
Date: Mon, 27 Sep 2010 08:23:45 +0000 (+0000)
Subject: Added a null check to fix #5688
X-Git-Tag: 6.7.0.beta1~1075^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=31d81e4be6daaddda3432936eaa2f3eb13f79fd0;p=vaadin-framework.git

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 7507e9f9fa..63a6776394 100644
--- 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) {
             calendarPanel.setFocusChangeListener(new FocusChangeListener() {
                 public void focusChanged(Date date) {
-                    Date date2 = new Date(calendarPanel.getDate().getTime());
+                	Date date2 = new Date();
+                	if (calendarPanel.getDate() != null) {
+                		date2.setTime(calendarPanel.getDate().getTime());
+                	}
                     /*
                      * Update the value of calendarPanel
                      */