Prevented possible NullPointerException's

[jpa-converters] / src / main / java / de / juplo / jpa / converters / ZonedDateTimeConverter.java

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 (file)
--- 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());
   }
 }