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

OO-1679: the calendar library don't check for null dtend, we must check it in our code

parent 0d0dda58
No related branches found
No related tags found
No related merge requests found
......@@ -359,15 +359,17 @@ public class ICalFileCalendarManager extends BasicManager implements CalendarMan
if(tz != null) {
dtBegin.setTimeZone(tz);
}
DateTime dtEnd = null;
Date kEventEnd = kEvent.getEnd();
if(kEventEnd != null) {
dtEnd = new DateTime(kEventEnd);
if(kEventEnd == null) {
vEvent = new VEvent(dtBegin, kEvent.getSubject());
} else {
DateTime dtEnd = new DateTime(kEventEnd);
if(tz != null) {
dtEnd.setTimeZone(tz);
}
vEvent = new VEvent(dtBegin, dtEnd, kEvent.getSubject());
}
vEvent = new VEvent(dtBegin, dtEnd, kEvent.getSubject());
} else {
// AllDay VEvent
net.fortuna.ical4j.model.Date dtBegin = CalendarUtils.createDate(kEvent.getBegin());
......
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