Merge branch 'master' of github.com:ServiceStack/ServiceStack.Text

Author: mythz

src/ServiceStack.Text/TextExtensions.cs

@@ -42,7 +42,7 @@ public static object ToCsvField(this object text)
                 textSerialized = TypeSerializer.SerializeToString(text).StripQuotes();
             }
 
-            return textSerialized == null || !CsvWriter.HasAnyEscapeChars(textSerialized)
+            return textSerialized.IsNullOrEmpty() || !CsvWriter.HasAnyEscapeChars(textSerialized)
                 ? textSerialized
                 : string.Concat
                   (

tests/ServiceStack.Text.Tests/CsvSerializerTests.cs

@@ -335,6 +335,26 @@ public void Can_serialize_single_ObjectDictionary_or_ObjectKvps()
             Assert.That(kvps.ToCsv().NormalizeNewLines(), Is.EqualTo("Id,CustomerId\n1,ALFKI").Or.EqualTo("CustomerId,Id\nALFKI,1"));
         }
 
+        [Test]
+        public void Can_serialize_single_ObjectDictionary_or_ObjectKvps_WithEmptyString()
+        {
+            var row = new Dictionary<string, object>
+            {
+                { "Id", 1 },
+                { "CustomerId", "" },
+            };
+
+            Assert.That(row.ToCsv().NormalizeNewLines(), Is.EqualTo("Id,CustomerId\n1,").Or.EqualTo("CustomerId,Id\n,1"));
+
+            var kvps = new[]
+            {
+                new KeyValuePair<string, object>("Id", 1),
+                new KeyValuePair<string, object>("CustomerId", ""),
+            };
+
+            Assert.That(kvps.ToCsv().NormalizeNewLines(), Is.EqualTo("Id,CustomerId\n1,").Or.EqualTo("CustomerId,Id\n,1"));
+        }
+        
         [Test]
         public void Can_serialize_single_StringDictionary_or_StringKvps()
         {