summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Englund <marc.englund@itmill.com>2012-04-25 13:11:34 +0000
committerMarc Englund <marc.englund@itmill.com>2012-04-25 13:11:34 +0000
commite6874b032d1370611e9943f5fa43485bb1b05ea1 (patch)
treefc8b8c85708bf404d06f8c442a2f2618cf7c11b1 /src
parent5de2ea4ca26b93d635fdc828c8da991907a7c8eb (diff)
downloadvaadin-framework-e6874b032d1370611e9943f5fa43485bb1b05ea1.tar.gz
vaadin-framework-e6874b032d1370611e9943f5fa43485bb1b05ea1.zip
Fixes #8693 by applying patch, adds automated test for the case.
svn changeset:23631/svn branch:6.8
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
index 91388edcaf..489bc715ed 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
@@ -111,6 +111,13 @@ public class VDateFieldCalendar extends VDateField {
*/
@SuppressWarnings("deprecation")
private void updateValueFromPanel() {
+
+ // If field is invisible at the beginning, client can still be null when
+ // this function is called.
+ if (getClient() == null) {
+ return;
+ }
+
Date date2 = calendarPanel.getDate();
Date currentDate = getCurrentDate();
if (currentDate == null || date2.getTime() != currentDate.getTime()) {