diff --git a/src/main/java/io/ebeaninternal/server/type/DataBind.java b/src/main/java/io/ebeaninternal/server/type/DataBind.java index 8ae786e87..9329f282c 100644 --- a/src/main/java/io/ebeaninternal/server/type/DataBind.java +++ b/src/main/java/io/ebeaninternal/server/type/DataBind.java @@ -159,7 +159,12 @@ public class DataBind { } public void setTime(Time v) throws SQLException { - pstmt.setTime(++pos, v); + Calendar timeZone = dataTimeZone.getTimeZone(); + if (timeZone != null) { + pstmt.setTime(++pos, v, timeZone); + } else { + pstmt.setTime(++pos, v); + } } public void setBoolean(boolean v) throws SQLException { diff --git a/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java b/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java index a30d3ee49..6124495a1 100644 --- a/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java +++ b/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java @@ -175,7 +175,12 @@ public class RsetDataReader implements DataReader { @Override public Time getTime() throws SQLException { - return rset.getTime(pos()); + Calendar cal = dataTimeZone.getTimeZone(); + if (cal != null) { + return rset.getTime(pos(), cal); + } else { + return rset.getTime(pos()); + } } @Override