From 0d470d61a5bafe5c9e890b438daa2bc7177a9b8e Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 8 Sep 2015 11:54:04 +0200
Subject: [PATCH] OO-1679: the calendar library don't check for null dtend, we
must check it in our code
---
.../olat/commons/calendar/ICalFileCalendarManager.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/commons/calendar/ICalFileCalendarManager.java b/src/main/java/org/olat/commons/calendar/ICalFileCalendarManager.java
index 7055f7c787c..b86a095be3a 100644
--- a/src/main/java/org/olat/commons/calendar/ICalFileCalendarManager.java
+++ b/src/main/java/org/olat/commons/calendar/ICalFileCalendarManager.java
@@ -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());
--
GitLab