X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fjpa%2Fconverters%2FOffsetDateTimeConverter.java;fp=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fjpa%2Fconverters%2FOffsetDateTimeConverter.java;h=3c4365f11d731dae149738f29238e7809e9ebbe0;hb=1870491f00f6d583d6ebe9270bf69e13633c1bf7;hp=3228acafa04f8b650c84ae148bc3b034f7c45925;hpb=cb60647c2cebf283e75e571c3b33a5bd733c080b;p=jpa-converters

diff --git a/src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java b/src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java
index 3228aca..3c4365f 100644
--- a/src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java
+++ b/src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java
@@ -2,7 +2,6 @@ package de.juplo.jpa.converters;
 
 import java.sql.Timestamp;
 import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 import javax.persistence.AttributeConverter;
 import javax.persistence.Converter;
 
@@ -19,7 +18,7 @@ public class OffsetDateTimeConverter implements AttributeConverter<OffsetDateTim
   {
     if (odt == null)
       return null;
-    return Timestamp.from(odt.withOffsetSameInstant(ZoneOffset.UTC).toInstant());
+    return Timestamp.valueOf(odt.withOffsetSameInstant(TimeConversions.getZoneOffset()).toLocalDateTime());
   }
 
   @Override
@@ -27,6 +26,6 @@ public class OffsetDateTimeConverter implements AttributeConverter<OffsetDateTim
   {
     if (ts == null)
       return null;
-    return OffsetDateTime.of(ts.toLocalDateTime(), ZoneOffset.UTC);
+    return OffsetDateTime.of(ts.toLocalDateTime(), TimeConversions.getZoneOffset());
   }
 }