import java.sql.Timestamp;
import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
@Override
public Timestamp convertToDatabaseColumn(OffsetDateTime odt)
{
- return Timestamp.from(odt.withOffsetSameInstant(ZoneOffset.UTC).toInstant());
+ if (odt == null)
+ return null;
+ return Timestamp.valueOf(odt.withOffsetSameInstant(TimeConversions.getZoneOffset()).toLocalDateTime());
}
@Override
public OffsetDateTime convertToEntityAttribute(Timestamp ts)
{
- return OffsetDateTime.of(ts.toLocalDateTime(), ZoneOffset.UTC);
+ if (ts == null)
+ return null;
+ return OffsetDateTime.of(ts.toLocalDateTime(), TimeConversions.getZoneOffset());
}
}