summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/ui/DateField.java
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/com/vaadin/ui/DateField.java')
-rw-r--r--server/src/com/vaadin/ui/DateField.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java
index 5017fac993..17dda73b95 100644
--- a/server/src/com/vaadin/ui/DateField.java
+++ b/server/src/com/vaadin/ui/DateField.java
@@ -402,13 +402,14 @@ public class DateField extends AbstractField<Date> implements
private void updateRangeValidator() {
if (currentRangeValidator != null) {
removeValidator(currentRangeValidator);
+ currentRangeValidator = null;
+ }
+ if (getRangeStart() != null || getRangeEnd() != null) {
+ currentRangeValidator = new DateRangeValidator(
+ dateOutOfRangeMessage, getRangeStart(resolution),
+ getRangeEnd(resolution), null);
+ addValidator(currentRangeValidator);
}
-
- currentRangeValidator = new DateRangeValidator(dateOutOfRangeMessage,
- getRangeStart(resolution), getRangeEnd(resolution), null);
-
- addValidator(currentRangeValidator);
-
}
/**