From eabdaab2f15f4325e936ca1268782ce7171023fb Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 2 Sep 2014 09:06:42 +0200
Subject: [PATCH] OO-1171: check if an end date is available
---
src/main/java/org/olat/commons/calendar/CalendarUtils.java | 4 +++-
.../olat/commons/calendar/ICalFileCalendarManagerTest.java | 5 +++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/commons/calendar/CalendarUtils.java b/src/main/java/org/olat/commons/calendar/CalendarUtils.java
index 88d2c45ccc5..4ba4ceb9d42 100644
--- a/src/main/java/org/olat/commons/calendar/CalendarUtils.java
+++ b/src/main/java/org/olat/commons/calendar/CalendarUtils.java
@@ -265,7 +265,9 @@ public class CalendarUtils {
for ( KalendarRecurEvent recurEvent : lstEvnt ) {
periodEvents.add(recurEvent);
}
- if (event.getEnd().before(periodStart) || event.getBegin().after(periodEnd)) continue;
+ if ((event.getEnd() != null && event.getEnd().before(periodStart)) || event.getBegin().after(periodEnd)) {
+ continue;
+ }
periodEvents.add(event);
}
return periodEvents;
diff --git a/src/test/java/org/olat/commons/calendar/ICalFileCalendarManagerTest.java b/src/test/java/org/olat/commons/calendar/ICalFileCalendarManagerTest.java
index 0cd0c3f2929..53f4ddba35d 100644
--- a/src/test/java/org/olat/commons/calendar/ICalFileCalendarManagerTest.java
+++ b/src/test/java/org/olat/commons/calendar/ICalFileCalendarManagerTest.java
@@ -123,6 +123,11 @@ public class ICalFileCalendarManagerTest extends OlatTestCase {
//persist
calManager.persistCalendar(reloadCalWrapper.getKalendar());
+
+ //an other possible RS
+ Date periodStart = new Date();
+ Date periodEnd = new Date();
+ CalendarUtils.listEventsForPeriod(reloadCalWrapper.getKalendar(), periodStart, periodEnd);
}
/**
--
GitLab