From ea7eba91c380907b23c30cf4758247fbcf114625 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Fri, 5 Aug 2016 12:04:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=BE=D1=81=D1=82=D1=8B=D0=BB=D1=8C:=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=B0=D1=80=D1=81=D0=B8=D0=BD=D0=B3=D0=B0=20=D0=B4=D0=B0?= =?UTF-8?q?=D1=82=D1=8B,=20=D0=BF=D1=80=D0=BE=D0=B1=D1=83=D0=B5=D0=BC=20?= =?UTF-8?q?=D0=B4=D1=80=D1=83=D0=B3=D0=BE=D0=B9=20=D1=84=D0=BE=D1=80=D0=BC?= =?UTF-8?q?=D0=B0=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../objects/CertDeserialize.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/dmitriymx/astralcheckreport/objects/CertDeserialize.java b/src/main/java/ru/dmitriymx/astralcheckreport/objects/CertDeserialize.java index 016a6cf..519b3fd 100644 --- a/src/main/java/ru/dmitriymx/astralcheckreport/objects/CertDeserialize.java +++ b/src/main/java/ru/dmitriymx/astralcheckreport/objects/CertDeserialize.java @@ -12,6 +12,7 @@ import java.text.SimpleDateFormat; public class CertDeserialize implements JsonDeserializer { private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + private SimpleDateFormat sdf2 = new SimpleDateFormat("dd.MM.yyyy"); @Override public Cert deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException { @@ -29,10 +30,23 @@ public class CertDeserialize implements JsonDeserializer { try { cert.startCertDate = sdf.parse(dateStr); + } catch (ParseException e) { + try { + cert.startCertDate = sdf2.parse(dateStr); + } catch (ParseException e1) { + e1.printStackTrace(); + } + } + + try { if (dateStrEnd != null) cert.endCertDate = sdf.parse(dateStrEnd); } catch (ParseException e) { - e.printStackTrace(); + try { + cert.endCertDate = sdf2.parse(dateStrEnd); + } catch (ParseException e1) { + e1.printStackTrace(); + } } return cert;