[libpostgresql-jdbc-java] 71/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 3d3acc911563275d2347ea2807cc8cbce52ba9fe
Author: Dave Cramer <dave.cramer at credativ.ca>
Date:   Sun Mar 23 12:44:47 2014 -0400

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

diff --git a/org/postgresql/jdbc2/TimestampUtils.java b/org/postgresql/jdbc2/TimestampUtils.java
index 03af10c..5e9427a 100644
--- a/org/postgresql/jdbc2/TimestampUtils.java
+++ b/org/postgresql/jdbc2/TimestampUtils.java
@@ -768,7 +768,7 @@ public class TimestampUtils {
             if (tz == null) {
                 tz = defaultTz;
             }
-            millis -= tz.getOffset(millis);
+            millis -= tz.getOffset(millis) + tz.getDSTSavings();
         }
 
         Timestamp ts = new Timestamp(millis);

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