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 065065114cdadaa74c9e2a2fb21c9cd1cba6a575..9e1a4742a8e88b414145a674d59f81a7eb1c74a6 100644 (file)
--- 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 {
     }\r
 \r
     public void setContainerDataSource(Container newDataSource) {\r
-       if (checkDataSource(newDataSource)) {\r
+       if (newDataSource==null||checkDataSource(newDataSource)) {\r
            this.dataSource = newDataSource;\r
        } else {\r
            // TODO error message\r