From: Marc Englund <marc.englund@itmill.com>
Date: Mon, 27 Aug 2007 14:36:16 +0000 (+0000)
Subject: null check fix
X-Git-Tag: 6.7.0.beta1~6062
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7abd8a3273a75ab82b8b308b808c16ab595ca67b;p=vaadin-framework.git

null check fix

svn changeset:2134/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/ui/CalendarField.java b/src/com/itmill/toolkit/ui/CalendarField.java
index 065065114c..9e1a4742a8 100644
--- a/src/com/itmill/toolkit/ui/CalendarField.java
+++ b/src/com/itmill/toolkit/ui/CalendarField.java
@@ -101,7 +101,7 @@ public class CalendarField extends DateField implements Container.Viewer {
     }
 
     public void setContainerDataSource(Container newDataSource) {
-	if (checkDataSource(newDataSource)) {
+	if (newDataSource==null||checkDataSource(newDataSource)) {
 	    this.dataSource = newDataSource;
 	} else {
 	    // TODO error message