From 78844bf305b5da4d96e9d4e1ddeeb9fcdea0a8ea Mon Sep 17 00:00:00 2001
From: Jonatan Kronqvist <jonatan.kronqvist@itmill.com>
Date: Fri, 28 Jan 2011 11:21:24 +0000
Subject: #6344 fixed, including test case

svn changeset:17056/svn branch:6.5
---
 src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java | 2 +-
 src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/com')

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
index a14e52d1e6..c8da86f206 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
@@ -114,7 +114,7 @@ public class VDateFieldCalendar extends VDateField {
         Date date2 = calendarPanel.getDate();
         Date currentDate = getCurrentDate();
         if (currentDate == null || date2.getTime() != currentDate.getTime()) {
-            setCurrentDate(date2);
+            setCurrentDate((Date) date2.clone());
             getClient().updateVariable(getId(), "year", date2.getYear() + 1900,
                     false);
             if (getCurrentResolution() > VDateField.RESOLUTION_YEAR) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
index 31e1824706..623bd1bf1b 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
@@ -103,7 +103,7 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field,
     private void updateValue(Date newDate) {
         Date currentDate = getCurrentDate();
         if (currentDate == null || newDate.getTime() != currentDate.getTime()) {
-            setCurrentDate(newDate);
+            setCurrentDate((Date) newDate.clone());
             getClient().updateVariable(getId(), "year",
                     newDate.getYear() + 1900, false);
             if (getCurrentResolution() > VDateField.RESOLUTION_YEAR) {
@@ -164,7 +164,7 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field,
         if (calendar.getResolution() != currentResolution) {
             calendar.setResolution(currentResolution);
             if (calendar.getDate() != null) {
-                calendar.setDate(getCurrentDate());
+                calendar.setDate((Date) getCurrentDate().clone());
                 // force re-render when changing resolution only
                 calendar.renderCalendar();
             }
-- 
cgit v1.2.3