From: Marc Englund <marc.englund@itmill.com>
Date: Fri, 30 May 2008 12:00:28 +0000 (+0000)
Subject: Threw npe if value was null, and used changed time before date. Probably caused ... 
X-Git-Tag: 6.7.0.beta1~4676
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c6127ec35780e6cdf14cd16055b26c3ba32d7407;p=vaadin-framework.git

Threw npe if value was null, and used changed time before date. Probably caused #1756

svn changeset:4715/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/Time.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/Time.java
index 3de9929a5c..46553a36a8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/Time.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/Time.java
@@ -247,6 +247,10 @@ public class Time extends FlowPanel implements ChangeListener {
     }
 
     public void onChange(Widget sender) {
+        if (datefield.getCurrentDate() == null) {
+            // was null on server, need to set
+            datefield.setCurrentDate(new Date());
+        }
         if (sender == hours) {
             int h = hours.getSelectedIndex();
             if (datefield.getDateTimeService().isTwelveHourClock()) {