1 files changed, 4 insertions, 19 deletions
diff --git a/juick-core/src/main/java/com/juick/xml/adapters/SimpleDateAdapter.java b/juick-core/src/main/java/com/juick/xml/adapters/SimpleDateAdapter.java
index 1093e47a..382db45a 100644
--- a/juick-core/src/main/java/com/juick/xml/adapters/SimpleDateAdapter.java
+++ b/juick-core/src/main/java/com/juick/xml/adapters/SimpleDateAdapter.java
@@ -1,10 +1,9 @@
 package com.juick.xml.adapters;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
+import com.juick.util.DateFormattersHolder;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
+import java.util.Date;
 
 /**
  * Created by vitalyster on 15.11.2016.
@@ -12,27 +11,13 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
 
 public class SimpleDateAdapter extends XmlAdapter<String, Date> {
 
-    private final SimpleDateFormat dateFormat;
-    public SimpleDateAdapter() {
-        dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-    }
-
     @Override
     public String marshal(Date v) throws Exception {
-        if (v == null) {
-            return null;
-        }
-        synchronized (dateFormat) {
-            return dateFormat.format(v);
-        }
+        return DateFormattersHolder.getMessageFormatterInstance().format(v);
     }
 
     @Override
     public Date unmarshal(String v) throws Exception {
-        synchronized (dateFormat) {
-            return dateFormat.parse(v);
-        }
+        return DateFormattersHolder.getMessageFormatterInstance().parse(v);
     }
-
 }