X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fjpa%2Fconverters%2FZonedDateTimeConverter.java;fp=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fjpa%2Fconverters%2FZonedDateTimeConverter.java;h=3816d1bbb508347abc5d57bd44413df032acfbfa;hb=cb60647c2cebf283e75e571c3b33a5bd733c080b;hp=63637ee0fd834b4aa0eea68dd762d5b08ceb149a;hpb=7a33791170cc1ad0825d97db411f45b9e3d84f78;p=jpa-converters

diff --git a/src/main/java/de/juplo/jpa/converters/ZonedDateTimeConverter.java b/src/main/java/de/juplo/jpa/converters/ZonedDateTimeConverter.java
index 63637ee..3816d1b 100644
--- a/src/main/java/de/juplo/jpa/converters/ZonedDateTimeConverter.java
+++ b/src/main/java/de/juplo/jpa/converters/ZonedDateTimeConverter.java
@@ -17,12 +17,16 @@ public class ZonedDateTimeConverter implements AttributeConverter<ZonedDateTime,
   @Override
   public Timestamp convertToDatabaseColumn(ZonedDateTime zdt)
   {
+    if (zdt == null)
+      return null;
     return Timestamp.from(zdt.withZoneSameInstant(ZoneId.systemDefault()).toInstant());
   }
 
   @Override
   public ZonedDateTime convertToEntityAttribute(Timestamp ts)
   {
+    if (ts == null)
+      return null;
     return ZonedDateTime.ofInstant(ts.toInstant(), ZoneId.systemDefault());
   }
 }