Skip to content

Commit 4ca12f9

Browse files
committed
Revert "Fix timezone offset calculation using Gregorian calendar"
This reverts commit 310468d.
1 parent b9e6c92 commit 4ca12f9

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

src/main/java/org/javarosa/xform/util/CalendarUtils.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,9 +420,7 @@ public static long toMillisFromJavaEpoch(int year, int month, int day) {
420420
public static long toMillisFromJavaEpoch(int year, int month, int day, DateTimeZone currentTimeZone) {
421421
int daysFromMinDay = countDaysFromMinDay(year, month, day);
422422
long millisFromMinDay = daysFromMinDay * UniversalDate.MILLIS_IN_DAY;
423-
424-
int timezoneOffsetFromUTC = currentTimeZone.getOffset(millisFromMinDay + MIN_MILLIS_FROM_JAVA_EPOCH);
425-
423+
int timezoneOffsetFromUTC = currentTimeZone.getOffset(millisFromMinDay);
426424
long millisNormalizedToUTC = millisFromMinDay - timezoneOffsetFromUTC;
427425
return millisNormalizedToUTC + MIN_MILLIS_FROM_JAVA_EPOCH;
428426
}

0 commit comments

Comments
 (0)