From 8fe1660479c1b68cdf7f8a2a8d2c78141045aa28 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipe.silva@oracle.com>
Date: Wed, 11 May 2022 12:40:52 +0100
Subject: [PATCH] Fix for ResultSetRegressionTest.testBug94457() sporadic
 failures.

Change-Id: Ie012d3fac59432503ac44b97758e579686e22503
---
 .../java/testsuite/regression/ResultSetRegressionTest.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/java/testsuite/regression/ResultSetRegressionTest.java b/src/test/java/testsuite/regression/ResultSetRegressionTest.java
index 4f93d4b30..2c6f6847e 100644
--- a/src/test/java/testsuite/regression/ResultSetRegressionTest.java
+++ b/src/test/java/testsuite/regression/ResultSetRegressionTest.java
@@ -68,6 +68,7 @@
 import java.sql.Timestamp;
 import java.sql.Types;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -7639,8 +7640,8 @@ public void testBug94457() throws Exception {
             System.out.println("getObject(ts, OffsetDateTime.class)  : " + odt2 + " (" + odt2.toEpochSecond() + ")");
             System.out.println("getObject(odt, OffsetDateTime.class) : " + odt3 + " (" + odt3.toEpochSecond() + ")");
 
-            int localOffset = TimeZone.getDefault().getRawOffset() / 1000;
-            int serverOffset = serverTz.getRawOffset() / 1000;
+            int localOffset = ZoneId.of(TimeZone.getDefault().getID()).getRules().getOffset(Instant.now()).getTotalSeconds();
+            int serverOffset = ZoneId.of(serverTz.getID()).getRules().getOffset(Instant.now()).getTotalSeconds();
 
             int expOffset = 6 * 60 * 60;