From 196359aecc522d16b8e7ca29b0cd9f6986706173 Mon Sep 17 00:00:00 2001
From: smallsql <smallsql>
Date: Tue, 25 Jan 2011 12:59:38 +0000
Subject: Fix for the timezone used to convert .NET DateTime to Java Timezone
 in the JDBC-ODBC bridge.

---
 openjdk/sun/jdbc/odbc/JdbcOdbcObject.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'openjdk/sun/jdbc/odbc/JdbcOdbcObject.java')

diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcObject.java b/openjdk/sun/jdbc/odbc/JdbcOdbcObject.java
index a4a72bd2..32e9a40f 100644
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcObject.java
+++ b/openjdk/sun/jdbc/odbc/JdbcOdbcObject.java
@@ -1,5 +1,6 @@
 /*
   Copyright (C) 2009 Volker Berlin (i-net software)
+  Copyright (C) 2011 Karsten Heinrich (i-net software)
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -583,8 +584,7 @@ public abstract class JdbcOdbcObject{
                 return null;
             }
             if(obj instanceof cli.System.DateTime){
-                cli.System.DateTime dt = (cli.System.DateTime)obj;
-                return new Timestamp(JdbcOdbcUtils.getJavaMillis(dt));
+            	return JdbcOdbcUtils.convertDateTimeToTimestamp((cli.System.DateTime)obj);
             }
             String str = obj.toString();
             return Timestamp.valueOf(str);
-- 
cgit v1.2.3