Merge remote-tracking branch 'upstream/master'

1 files changed, 15 insertions, 1 deletions

diff --git a/src/org/traccar/helper/DateUtil.java b/src/org/traccar/helper/DateUtil.java
index 0dca88a2b..de36d4420 100644
--- a/src/org/traccar/helper/DateUtil.java
+++ b/src/org/traccar/helper/DateUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,14 @@ package org.traccar.helper;
 import java.util.Calendar;
 import java.util.Date;
 
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
+
 public final class DateUtil {
 
+    private static final DateTimeFormatter DATE_FORMAT = ISODateTimeFormat.dateTimeParser();
+
     private DateUtil() {
     }
 
@@ -55,4 +61,12 @@ public final class DateUtil {
         return calendar.getTime();
     }
 
+    public static Date parseDate(String value) {
+        return DATE_FORMAT.parseDateTime(value).toDate();
+    }
+
+    public static DateTime parseDateTime(String value) {
+        return DATE_FORMAT.withOffsetParsed().parseDateTime(value);
+    }
+
 }