Add fallback for invalid date formats

Author: mythz

src/ServiceStack.Text/Common/DateTimeSerializer.cs

@@ -129,9 +129,13 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
 
                 if (dateTimeStr.Length == ShortDateTimeFormat.Length)
                 {
-                    var manualDate = ParseManual(dateTimeStr);
-                    if (manualDate != null)
-                        return manualDate.Value;
+                    try
+                    {
+                        var manualDate = ParseManual(dateTimeStr);
+                        if (manualDate != null)
+                            return manualDate.Value;
+                    }
+                    catch {}
                 }
 
                 try
@@ -191,14 +195,16 @@ private static string RepairXsdTimeSeparator(string dateTimeStr)
             if (parts.Length == 1)
                 parts = dateTimeStr.SplitOnFirst(' ');
 
-            var dateParts = parts[0].Split('-');
+            var dateParts = parts[0].Split('-','/');
             int hh = 0, min = 0, ss = 0, ms = 0;
             double subMs = 0;
             int offsetMultiplier = 0;
 
             if (parts.Length == 1)
             {
-                return new DateTime(int.Parse(dateParts[0]), int.Parse(dateParts[1]), int.Parse(dateParts[2]), 0, 0, 0, 0, dateKind);
+                return dateParts.Length == 3 && dateParts[2].Length == "YYYY".Length
+                    ? new DateTime(int.Parse(dateParts[2]), int.Parse(dateParts[1]), int.Parse(dateParts[0]), 0, 0, 0, 0, dateKind)
+                    : new DateTime(int.Parse(dateParts[0]), int.Parse(dateParts[1]), int.Parse(dateParts[2]), 0, 0, 0, 0, dateKind);
             }
             else if (parts.Length == 2)
             {

tests/ServiceStack.Text.Tests/AdhocModelTests.cs

@@ -5,6 +5,7 @@
 using System.Runtime.Serialization;
 using System.Xml;
 using NUnit.Framework;
+using ServiceStack.Text.Common;
 using ServiceStack.Text.Jsv;
 
 namespace ServiceStack.Text.Tests
@@ -775,5 +776,26 @@ public void Can_serialize_ICollection()
             Assert.AreEqual(dto.Blah.Count, from.Blah.Count);
             from.PrintDump();
         }
+
+        [Test]
+        public void Can_parse_different_3_part_date_formats()
+        {
+            Assert.That("28/06/2015".FromJsv<DateTime>().ToLongDateString(),
+                Is.EqualTo("Sunday, June 28, 2015"));
+
+            Assert.That("6/28/2015".FromJsv<DateTime>().ToLongDateString(),
+                Is.EqualTo("Sunday, June 28, 2015"));
+
+            DateTimeSerializer.OnParseErrorFn = (s, ex) =>
+            {
+                var parts = s.Split('/');
+                return new DateTime(int.Parse(parts[2]), int.Parse(parts[0]), int.Parse(parts[1]));
+            };
+
+            Assert.That("06/28/2015".FromJsv<DateTime>().ToLongDateString(),
+                Is.EqualTo("Sunday, June 28, 2015"));
+
+            DateTimeSerializer.OnParseErrorFn = null;
+        }
     }
 }