Prevented possible NullPointerException's

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

diff --git a/src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java b/src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java
index 8815cf0..3228aca 100644 (file)
--- a/src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java
+++ b/src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java
@@ -17,12 +17,16 @@ public class OffsetDateTimeConverter implements AttributeConverter<OffsetDateTim
   @Override
   public Timestamp convertToDatabaseColumn(OffsetDateTime odt)
   {
+    if (odt == null)
+      return null;
     return Timestamp.from(odt.withOffsetSameInstant(ZoneOffset.UTC).toInstant());
   }
 
   @Override
   public OffsetDateTime convertToEntityAttribute(Timestamp ts)
   {
+    if (ts == null)
+      return null;
     return OffsetDateTime.of(ts.toLocalDateTime(), ZoneOffset.UTC);
   }
 }