From 872e8e30474a17b7a22b24aec7cac33cf6c8b95e Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 5 Nov 2015 14:32:07 +0100
Subject: [PATCH] OO-1645: possible NPE if the date field is empty
---
.../java/org/olat/commons/calendar/ui/CalendarEntryForm.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/commons/calendar/ui/CalendarEntryForm.java b/src/main/java/org/olat/commons/calendar/ui/CalendarEntryForm.java
index 5d7481c1bfd..b85ee828b7f 100644
--- a/src/main/java/org/olat/commons/calendar/ui/CalendarEntryForm.java
+++ b/src/main/java/org/olat/commons/calendar/ui/CalendarEntryForm.java
@@ -217,7 +217,7 @@ public class CalendarEntryForm extends FormBasicController {
if (end.getDate() == null) {
end.setErrorKey("cal.form.error.date", null);
allOk &= false;
- } else if (end.getDate().before(begin.getDate())) {
+ } else if (begin.getDate() != null && end.getDate().before(begin.getDate())) {
end.setErrorKey("cal.form.error.endbeforebegin", null);
allOk &= false;
}
@@ -229,7 +229,8 @@ public class CalendarEntryForm extends FormBasicController {
allOk &= false;
}
- if (hasEnd && recurrenceEnd.getDate().before(begin.getDate())) {
+ if (hasEnd && recurrenceEnd.getDate() != null && begin.getDate() != null
+ && recurrenceEnd.getDate().before(begin.getDate())) {
recurrenceEnd.setErrorKey("cal.form.error.endbeforebegin", null);
allOk &= false;
}
--
GitLab