User: sgrimstad Date: 24 Sep 18 18:03 Revision: c88061ca99cdb86952cc51e1bbf5d76738f49764 Summary: IGNITE-9669 implemented TeamCity URL: https://ci.ignite.apache.org/viewModification.html?tab=vcsModificationFiles&modId=832500&personal=false Index: modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2RowDescriptor.java =================================================================== --- modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2RowDescriptor.java (revision 49315c851e6e2f08c6bd539a3a7a72fd5144bb69) +++ modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2RowDescriptor.java (revision c88061ca99cdb86952cc51e1bbf5d76738f49764) @@ -38,6 +38,7 @@ import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing; import org.h2.message.DbException; import org.h2.result.SearchRow; +import org.h2.util.DateTimeUtils; import org.h2.util.LocalDateTimeUtils; import org.h2.value.DataType; import org.h2.value.Value; @@ -236,7 +237,8 @@ case Value.TIMESTAMP: if (obj instanceof java.util.Date && !(obj instanceof Timestamp)) - obj = new Timestamp(((java.util.Date)obj).getTime()); + return ValueDate.fromDateValue(DateTimeUtils.dateValueFromDate( + java.util.Date.class.cast(obj).getTime())); if (LocalDateTimeUtils.isLocalDateTime(obj.getClass())) return LocalDateTimeUtils.localDateTimeToValue(obj);