ServiceStack · mythz · Mar 11, 2012 · Mar 6, 2012 · Mar 7, 2012
diff --git a/src/ServiceStack.Text/Common/DeserializeTypeRefJson.cs b/src/ServiceStack.Text/Common/DeserializeTypeRefJson.cs
@@ -93,7 +93,8 @@ internal static object StringToType(
 					}
 					catch
 					{
-						Tracer.Instance.WriteWarning("WARN: failed to set dynamic property {0} with: {1}", propertyName, propertyValueStr);
+						if (JsConfig.ThrowOnDeserializationError) throw;
+						else Tracer.Instance.WriteWarning("WARN: failed to set dynamic property {0} with: {1}", propertyName, propertyValueStr);
 					}
 				}
 
@@ -106,7 +107,8 @@ internal static object StringToType(
 					}
 					catch
 					{
-						Tracer.Instance.WriteWarning("WARN: failed to set property {0} with: {1}", propertyName, propertyValueStr);
+						if (JsConfig.ThrowOnDeserializationError) throw;
+						else Tracer.Instance.WriteWarning("WARN: failed to set property {0} with: {1}", propertyName, propertyValueStr);
 					}
 				}
 

diff --git a/src/ServiceStack.Text/Common/DeserializeTypeRefJsv.cs b/src/ServiceStack.Text/Common/DeserializeTypeRefJsv.cs
@@ -84,7 +84,8 @@ internal static object StringToType(
 					}
 					catch
 					{
-						Tracer.Instance.WriteWarning("WARN: failed to set dynamic property {0} with: {1}", propertyName, propertyValueStr);
+						if (JsConfig.ThrowOnDeserializationError) throw;
+						else Tracer.Instance.WriteWarning("WARN: failed to set dynamic property {0} with: {1}", propertyName, propertyValueStr);
 					}
 				}
 
@@ -97,7 +98,8 @@ internal static object StringToType(
 					}
 					catch
 					{
-						Tracer.Instance.WriteWarning("WARN: failed to set property {0} with: {1}", propertyName, propertyValueStr);
+						if (JsConfig.ThrowOnDeserializationError) throw;
+						else Tracer.Instance.WriteWarning("WARN: failed to set property {0} with: {1}", propertyName, propertyValueStr);
 					}
 				}
 

diff --git a/src/ServiceStack.Text/Common/WriteType.cs b/src/ServiceStack.Text/Common/WriteType.cs
@@ -213,7 +213,14 @@ public static void WriteProperties(TextWriter writer, object value)
 					writer.Write(JsWriter.MapKeySeperator);
 
 					if (typeof (TSerializer) == typeof (JsonTypeSerializer)) JsState.IsWritingValue = true;
-					propertyWriter.WriteFn(writer, propertyValue);
+					if (propertyValue == null)
+					{
+						writer.Write(JsonUtils.Null);
+					}
+					else
+					{
+						propertyWriter.WriteFn(writer, propertyValue);
+					}
 					if (typeof(TSerializer) == typeof(JsonTypeSerializer)) JsState.IsWritingValue = false;
 				}
 			}

diff --git a/src/ServiceStack.Text/JsConfig.cs b/src/ServiceStack.Text/JsConfig.cs
@@ -105,6 +105,29 @@ public static bool EmitCamelCaseNames
 			}
 		}
 
+		/// <summary>
+		/// Gets or sets a value indicating if the framework should throw serialization exceptions
+		/// or continue regardless of deserialization errors. If <see langword="true"/>  the framework
+		/// will throw; otherwise, it will parse as many fields as possible. The default is <see langword="false"/>.
+		/// </summary>
+		[ThreadStatic]
+		private static bool? tsThrowOnDeserializationError;
+		private static bool? sThrowOnDeserializationError;
+		public static bool ThrowOnDeserializationError
+		{
+			// obeying the use of ThreadStatic, but allowing for setting JsConfig once as is the normal case
+			get
+			{
+				return tsThrowOnDeserializationError ?? sThrowOnDeserializationError ?? false;
+			}
+			set
+			{
+				bool theValue = value;
+				if (!tsThrowOnDeserializationError.HasValue) tsThrowOnDeserializationError = value;
+				if (!sThrowOnDeserializationError.HasValue) sThrowOnDeserializationError = value;
+			}
+		}
+
 		internal static HashSet<Type> HasSerializeFn = new HashSet<Type>();
 
 		public static void Reset()
@@ -114,6 +137,7 @@ public static void Reset()
 			tsExcludeTypeInfo = sExcludeTypeInfo = null;
 			tsEmitCamelCaseNames = sEmitCamelCaseNames = null;
 			tsDateHandler = sDateHandler = null;
+			tsThrowOnDeserializationError = sThrowOnDeserializationError = null;
 			HasSerializeFn = new HashSet<Type>();
 		}
 

diff --git a/tests/ServiceStack.Text.Tests/JsonTests/BasicJsonTests.cs b/tests/ServiceStack.Text.Tests/JsonTests/BasicJsonTests.cs
@@ -96,13 +96,19 @@ public void Serialize_can_include_null_values()
 				Type = "Programmer",
 				SampleKey = 12,
 				Nothing = null,
-				NullableDateTime = null
+				NullableDateTime = null,
+				NullClass = null
 			};
 
 			JsConfig.IncludeNullValues = true;
 			var s = JsonSerializer.SerializeToString(o);
 			JsConfig.Reset();
-			Assert.That(s, Is.EqualTo("{\"Name\":\"Brandon\",\"Type\":\"Programmer\",\"SampleKey\":12,\"Nothing\":null,\"NullableDateTime\":null}"));
+			Assert.That(s, Is.EqualTo("{\"Name\":\"Brandon\",\"Type\":\"Programmer\",\"SampleKey\":12,\"Nothing\":null,\"NullableDateTime\":null,\"NullClass\":null}"));
+		}
+
+		private class NullClass
+		{
+
 		}
 
 		[Test]
@@ -153,6 +159,8 @@ public string Nothing
 				set;
 			}
 
+			public NullClass NullClass { get; set; }
+
 			public DateTime? NullableDateTime { get; set; }
 
 			public NullValueTester()

diff --git a/tests/ServiceStack.Text.Tests/JsonTests/ThrowOnDeserializeErrorTest.cs b/tests/ServiceStack.Text.Tests/JsonTests/ThrowOnDeserializeErrorTest.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using NUnit.Framework;
+using ServiceStack.Text.Tests.Support;
+
+namespace ServiceStack.Text.Tests.JsonTests
+{
+	[TestFixture]
+	public class ThrowOnDeserializeErrorTest
+	{
+
+		[Test]
+		public void TestThrows()
+		{
+			JsConfig.Reset();
+			JsConfig.ThrowOnDeserializationError = true;
+
+			string json = @"{""idBad"":""abc"", ""idGood"":""2"" }";
+
+			bool threw = false;
+			try
+			{
+				JsonSerializer.DeserializeFromString(json, typeof(TestDto));
+			}
+			catch (Exception)
+			{
+				threw = true;
+			}
+
+			Assert.IsTrue(threw, "Should have thrown");
+		}
+
+		[Test]
+		public void TestDoesNotThrow()
+		{
+			JsConfig.Reset();
+			JsConfig.ThrowOnDeserializationError = false;
+			string json = @"{""idBad"":""abc"", ""idGood"":""2"" }";
+			JsonSerializer.DeserializeFromString(json, typeof(TestDto));
+		}
+
+		[Test]
+		public void TestReset()
+		{
+			JsConfig.Reset();
+			Assert.IsFalse(JsConfig.ThrowOnDeserializationError);
+			JsConfig.ThrowOnDeserializationError = true;
+			Assert.IsTrue(JsConfig.ThrowOnDeserializationError);
+			JsConfig.Reset();
+			Assert.IsFalse(JsConfig.ThrowOnDeserializationError);
+		}
+
+		[DataContract]
+		class TestDto
+		{
+			[DataMember(Name = "idGood")]
+			public int IdGood { get; set; }
+			[DataMember(Name = "idBad")]
+			public int IdBad { get; set; }
+		}
+	}
+}
diff --git a/tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj b/tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj
@@ -175,6 +175,7 @@
     <Compile Include="CsvTests\CustomHeaderTests.cs" />
     <Compile Include="JsonTests\JsonDateTimeTests.cs" />
     <Compile Include="JsonTests\PolymorphicListTests.cs" />
+    <Compile Include="JsonTests\ThrowOnDeserializeErrorTest.cs" />
     <Compile Include="JsvTests\JsvDeserializeTypeTest.cs" />
     <Compile Include="MessagingTests.cs" />
     <Compile Include="NullableTypesTests.cs" />