SAK-40670 - Calendar doesn't check summer or winter time on external …

…subscribing events (sakaiproject#6043)
stetsche · Oct 4, 2018 · 784b6da · 784b6da
1 parent 273d979
commit 784b6da
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...r/calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/readers/IcalendarReader.java b/...r/calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/readers/IcalendarReader.java
@@ -27,6 +27,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 
 import org.sakaiproject.calendar.impl.GenericCalendarImporter;
 import org.sakaiproject.exception.ImportException;
@@ -238,6 +239,10 @@ public List filterEvents(List events, String[] customFieldNames, String tzid) th
 			// Raw + calendar/owner TZ's offset
 			ZonedDateTime srcZonedDateTime = startInstant.atZone(srcZoneId);
 			long millis = startInstant.plusMillis(srcZonedDateTime.getOffset().getTotalSeconds() * 1000).toEpochMilli();
+			TimeZone tz = TimeZone.getTimeZone(tzid);
+			if( tz.inDaylightTime(startDate) ) {
+				millis = millis - tz.getDSTSavings();
+			}
 
 			// Duration of event
 			Duration gapMinutes = Duration.ofMinutes(durationInMinutes);