fix: ResultSet.getDate is often wrong as it fetches day-precision times

Change-Id: Id9394b12663e78de96a3610590587d3f15096e15

diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java
index 275aa20e127db2eaec23738e45d8815101c90e74..2aecedf75e295f4a6af95fec61af7006bfafd3ac 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Certificate.java
+++ b/src/org/cacert/gigi/dbObjects/Certificate.java
@@ -471,7 +471,7 @@ public class Certificate implements IdCachable {
                 prep.setInt(1, getId());
                 GigiResultSet res = prep.executeQuery();
                 if (res.next()) {
-                    return new java.util.Date(res.getDate("revoked").getTime());
+                    return new java.util.Date(res.getTimestamp("revoked").getTime());
                 }
             }
         }

diff --git a/tests/org/cacert/gigi/TestUserGroupMembership.java b/tests/org/cacert/gigi/TestUserGroupMembership.java
index 2213557454f53d4462ca1fe298ec9f66cba3b09d..5ddf2d11026a22d41c70849cf0d51058f176eba6 100644 (file)
--- a/tests/org/cacert/gigi/TestUserGroupMembership.java
+++ b/tests/org/cacert/gigi/TestUserGroupMembership.java
@@ -48,8 +48,8 @@ public class TestUserGroupMembership extends BusinessTest {
             assertEquals(granter.getId(), rs.getInt("grantedby"));
             assertEquals(ttpGroup.getDBName(), rs.getString("permission"));
 
-            assertNull(rs.getDate("deleted"));
-            assertNotNull(rs.getDate("granted"));
+            assertNull(rs.getTimestamp("deleted"));
+            assertNotNull(rs.getTimestamp("granted"));
 
             assertFalse(rs.next());
         }
@@ -80,8 +80,8 @@ public class TestUserGroupMembership extends BusinessTest {
             assertEquals(granter.getId(), rs.getInt("grantedby"));
             assertEquals(ttpGroup.getDBName(), rs.getString("permission"));
 
-            assertNotNull(rs.getDate("deleted"));
-            assertNotNull(rs.getDate("granted"));
+            assertNotNull(rs.getTimestamp("deleted"));
+            assertNotNull(rs.getTimestamp("granted"));
 
             assertFalse(rs.next());
         }