From 9ae3efc8f970cb1bb22bed027af56c5c01deae15 Mon Sep 17 00:00:00 2001 From: Ben Fortuna Date: Mon, 8 Jul 2019 12:43:08 +1000 Subject: [PATCH] Allow for null observances --- src/main/java/net/fortuna/ical4j/model/TimeZone.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/fortuna/ical4j/model/TimeZone.java b/src/main/java/net/fortuna/ical4j/model/TimeZone.java index 6427c267b..cd8990960 100644 --- a/src/main/java/net/fortuna/ical4j/model/TimeZone.java +++ b/src/main/java/net/fortuna/ical4j/model/TimeZone.java @@ -33,6 +33,7 @@ import net.fortuna.ical4j.model.component.Daylight; import net.fortuna.ical4j.model.component.Observance; +import net.fortuna.ical4j.model.component.Standard; import net.fortuna.ical4j.model.component.VTimeZone; import net.fortuna.ical4j.model.property.TzId; import net.fortuna.ical4j.model.property.TzOffsetFrom; @@ -195,7 +196,7 @@ private static int getRawOffset(VTimeZone vt) { if (offsetFrom != null) { return (int) (offsetFrom.getOffset().getTotalSeconds() * 1000L); } - } else { + } else if (latestSeasonalTime instanceof Standard) { final TzOffsetTo offsetTo = latestSeasonalTime.getProperty(Property.TZOFFSETTO); if (offsetTo != null) { return (int) (offsetTo.getOffset().getTotalSeconds() * 1000L);