[libpostgresql-jdbc-java] 70/93: use DSTSavings when converting to timestamp

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag REL9_3_1102
in repository libpostgresql-jdbc-java.

commit dde1d85c367781892bacb0657f1cf8629c90cc31
Author: Dave Cramer <dave.cramer at credativ.ca>
Date:   Sun Mar 23 12:46:25 2014 -0400

    use DSTSavings when converting to timestamp
---
 org/postgresql/jdbc2/TimestampUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org/postgresql/jdbc2/TimestampUtils.java b/org/postgresql/jdbc2/TimestampUtils.java
index 80386c3..03af10c 100644
--- a/org/postgresql/jdbc2/TimestampUtils.java
+++ b/org/postgresql/jdbc2/TimestampUtils.java
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
 *
-* Copyright (c) 2003-2011, PostgreSQL Global Development Group
+* Copyright (c) 2003-2014, PostgreSQL Global Development Group
 *
 *
 *-------------------------------------------------------------------------
@@ -793,7 +793,7 @@ public class TimestampUtils {
         if (tz == null) {
             tz = defaultTz;
         }
-        int offset = tz.getOffset(millis);
+        int offset = tz.getOffset(millis) + tz.getDSTSavings();
         long timePart = millis % ONEDAY;
         if (timePart + offset >= ONEDAY) {
             millis += ONEDAY;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpostgresql-jdbc-java.git