Fix issues when using java.sql.Date as DateField range (#15342)

Change-Id: I656cc0600f929239605e17ab9cf71dc1ba96582f

1 files changed, 8 insertions, 6 deletions

diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java
index 030bd5f6c2..d5700c4b65 100644
--- a/server/src/com/vaadin/ui/DateField.java
+++ b/server/src/com/vaadin/ui/DateField.java
@@ -316,10 +316,10 @@ public class DateField extends AbstractField<Date> implements
             throw new IllegalStateException(
                     "startDate cannot be later than endDate");
         }
-        getState().rangeStart = startDate;
-        // rangeStart = startDate;
-        // This has to be done to correct for the resolution
-        // updateRangeState();
+
+        // Create a defensive copy against issues when using java.sql.Date (and
+        // also against mutable Date).
+        getState().rangeStart = new Date(startDate.getTime());
         updateRangeValidator();
     }
 
@@ -436,8 +436,10 @@ public class DateField extends AbstractField<Date> implements
             throw new IllegalStateException(
                     "endDate cannot be earlier than startDate");
         }
-        // rangeEnd = endDate;
-        getState().rangeEnd = endDate;
+
+        // Create a defensive copy against issues when using java.sql.Date (and
+        // also against mutable Date).
+        getState().rangeEnd = new Date(endDate.getTime());
         updateRangeValidator();
     }