From 79180506b6acbe5621db5f6f5b9164b256fef5d4 Mon Sep 17 00:00:00 2001 From: Adam Saghy Date: Wed, 3 Aug 2022 19:41:04 +0200 Subject: [PATCH] Fix OffsetDateTime fetch from DB --- .../fineract/infrastructure/core/domain/JdbcSupport.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/JdbcSupport.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/JdbcSupport.java index 2be81ae87..40f3c35f2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/JdbcSupport.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/JdbcSupport.java @@ -27,7 +27,6 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; import java.time.OffsetDateTime; -import java.time.ZoneOffset; import java.time.ZonedDateTime; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.springframework.jdbc.support.JdbcUtils; @@ -139,7 +138,8 @@ public final class JdbcSupport { public static OffsetDateTime getOffsetDateTime(ResultSet rs, String columnName) throws SQLException { final Timestamp timestamp = rs.getTimestamp(columnName); if (timestamp != null) { - OffsetDateTime offsetDateTimeAtUTC = OffsetDateTime.of(timestamp.toLocalDateTime(), ZoneOffset.UTC); + OffsetDateTime offsetDateTimeAtUTC = OffsetDateTime.of(timestamp.toLocalDateTime(), + DateUtils.getSystemZoneId().getRules().getOffset(timestamp.toLocalDateTime())); return offsetDateTimeAtUTC .withOffsetSameInstant(DateUtils.getDateTimeZoneOfTenant().getRules().getOffset(offsetDateTimeAtUTC.toInstant())); }