Use Calendar.getTimeInMillis() instead of Calendar.getTime().getTime()

h2/src/main/org/h2/expression/Function.java

@@ -1856,8 +1856,7 @@ public class Function extends Expression implements FunctionCall {
         int nanos = d.getNanos() % 1000000;
         calendar.setTime(d);
         calendar.add(field, (int) count);
-        long t = calendar.getTime().getTime();
-        Timestamp ts = new Timestamp(t);
+        Timestamp ts = new Timestamp(calendar.getTimeInMillis());
         ts.setNanos(ts.getNanos() + nanos);
         return ts;
     }

h2/src/main/org/h2/util/DateTimeUtils.java

@@ -288,7 +288,7 @@ public class DateTimeUtils {
         Calendar local = DateTimeUtils.createGregorianCalendar();
         local.setTime(x);
         convertTime(local, target);
-        return target.getTime().getTime();
+        return target.getTimeInMillis();
     }
 
     private static void convertTime(Calendar from, Calendar to) {
@@ -474,7 +474,7 @@ public class DateTimeUtils {
         }
         c.setLenient(lenient);
         setCalendarFields(c, year, month, day, hour, minute, second, millis);
-        return c.getTime().getTime();
+        return c.getTimeInMillis();
     }
 
     private static void setCalendarFields(Calendar cal, int year, int month,

h2/src/test/org/h2/test/jdbc/TestResultSet.java

@@ -1309,7 +1309,7 @@ public class TestResultSet extends TestBase {
                         java.sql.Timestamp.valueOf("2011-11-11 00:00:00.0").getTime());
         o = rs.getObject(2, Calendar.class);
         assertTrue(o instanceof Calendar);
-        assertEquals(((Calendar) o).getTime().getTime(),
+        assertEquals(((Calendar) o).getTimeInMillis(),
                         java.sql.Timestamp.valueOf("2011-11-11 00:00:00.0").getTime());
         rs.next();