commit acf78d8091f29e6a67ae7214ba56b70b6ce5a317
author Mark Struberg <struberg@apache.org> Sun Mar 31 22:32:17 2019 +0200
committer Mark Struberg <struberg@apache.org> Sun Mar 31 22:32:17 2019 +0200
tree a00995a7a3f1b4d7781c6c5ec775f83b1f4de79b
parent 31c0450562c71b63f7bea8edaf9b6378f724ed70

OPENJPA-2713 fix wrong offset after daylight saving switched

openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java

diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
index 8e77c29..0767fd6 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
@@ -825,7 +825,7 @@
      */
     public OffsetDateTime getOffsetDateTime(ResultSet rs, int column) throws SQLException {
         Timestamp tst = rs.getTimestamp(column);
-        return tst != null ? tst.toLocalDateTime().atOffset(OffsetDateTime.now().getOffset()) : null;
+        return tst != null ? tst.toLocalDateTime().atZone(ZoneId.systemDefault()).toOffsetDateTime() : null;
     }
 
     private ProxyManager getProxyManager() {