From 02d33ca7aea74f31319ce3920a7c67ac6f59571b Mon Sep 17 00:00:00 2001 From: Teemu Pöntelin Date: Mon, 15 Dec 2014 20:10:53 +0200 Subject: Fix NPE in DateField range handling (#15342) The NPE was introduced by 206055708b0a8e1c17a8c63d482a5e202d3ebf6d. Change-Id: I34401e108f7c02ee2f0aab581a78b9ab468b2b46 --- server/src/com/vaadin/ui/DateField.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'server/src/com') diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java index d5700c4b65..3d683f4902 100644 --- a/server/src/com/vaadin/ui/DateField.java +++ b/server/src/com/vaadin/ui/DateField.java @@ -319,7 +319,8 @@ public class DateField extends AbstractField implements // Create a defensive copy against issues when using java.sql.Date (and // also against mutable Date). - getState().rangeStart = new Date(startDate.getTime()); + getState().rangeStart = startDate != null ? new Date( + startDate.getTime()) : null; updateRangeValidator(); } @@ -439,7 +440,8 @@ public class DateField extends AbstractField implements // Create a defensive copy against issues when using java.sql.Date (and // also against mutable Date). - getState().rangeEnd = new Date(endDate.getTime()); + getState().rangeEnd = endDate != null ? new Date(endDate.getTime()) + : null; updateRangeValidator(); } -- cgit v1.2.3