Skip to content
Snippets Groups Projects
Commit eabdaab2 authored by srosse's avatar srosse
Browse files

OO-1171: check if an end date is available

parent 792f53b4
No related branches found
No related tags found
No related merge requests found
...@@ -265,7 +265,9 @@ public class CalendarUtils { ...@@ -265,7 +265,9 @@ public class CalendarUtils {
for ( KalendarRecurEvent recurEvent : lstEvnt ) { for ( KalendarRecurEvent recurEvent : lstEvnt ) {
periodEvents.add(recurEvent); 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); periodEvents.add(event);
} }
return periodEvents; return periodEvents;
......
...@@ -123,6 +123,11 @@ public class ICalFileCalendarManagerTest extends OlatTestCase { ...@@ -123,6 +123,11 @@ public class ICalFileCalendarManagerTest extends OlatTestCase {
//persist //persist
calManager.persistCalendar(reloadCalWrapper.getKalendar()); calManager.persistCalendar(reloadCalWrapper.getKalendar());
//an other possible RS
Date periodStart = new Date();
Date periodEnd = new Date();
CalendarUtils.listEventsForPeriod(reloadCalWrapper.getKalendar(), periodStart, periodEnd);
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment