From 7a3c3f11fd83a4ec66086ed033feee027e252832 Mon Sep 17 00:00:00 2001
From: Anton Domnikov <anton.domnikoff@gmail.com>
Date: Fri, 2 Feb 2018 17:04:11 +0300
Subject: [PATCH] fixed parsing when date is empty (#100)

---
 .../templates/logansquare/LoganSquareJodaTimeConverter.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/touchin/templates/logansquare/LoganSquareJodaTimeConverter.java b/src/main/java/ru/touchin/templates/logansquare/LoganSquareJodaTimeConverter.java
index 4bcf775..c3e6cfa 100644
--- a/src/main/java/ru/touchin/templates/logansquare/LoganSquareJodaTimeConverter.java
+++ b/src/main/java/ru/touchin/templates/logansquare/LoganSquareJodaTimeConverter.java
@@ -42,7 +42,7 @@ public class LoganSquareJodaTimeConverter implements TypeConverter<DateTime> {
     @Override
     public DateTime parse(@NonNull final JsonParser jsonParser) throws IOException {
         final String dateString = jsonParser.getValueAsString();
-        if (dateString == null) {
+        if (dateString == null || dateString.isEmpty()) {
             return null;
         }
         try {
@@ -60,9 +60,9 @@ public class LoganSquareJodaTimeConverter implements TypeConverter<DateTime> {
                           @NonNull final JsonGenerator jsonGenerator)
             throws IOException {
         if (fieldName != null) {
-            jsonGenerator.writeStringField(fieldName, object != null ? object.toString() : null);
+            jsonGenerator.writeStringField(fieldName, object != null && !object.toString().isEmpty() ? object.toString() : null);
         } else {
-            jsonGenerator.writeString(object != null ? object.toString() : null);
+            jsonGenerator.writeString(object != null && !object.toString().isEmpty() ? object.toString() : null);
         }
     }