correct a bug which prevent using null value in JSON when converting to an object

dlacroix · dlacroix · commit 24ea5fadff87 · 2017-08-23T13:33:53.000+02:00
diff --git a/Erasme.Http/Erasme.Json/JsonValue.cs b/Erasme.Http/Erasme.Json/JsonValue.cs
@@ -280,14 +280,14 @@ object ToObjectInternal(Type type)
 					if (!ContainsKey(field.Name))
 						continue;
 					var value = this[field.Name];
-					field.SetValue(result, value.ToObjectInternal(field.FieldType));
+					field.SetValue(result, value == null ? null : value.ToObjectInternal(field.FieldType));
 				}
 				foreach (var prop in type.GetProperties())
 				{
 					if (!ContainsKey(prop.Name))
 						continue;
 					var value = this[prop.Name];
-					prop.SetValue(result, value.ToObjectInternal(prop.PropertyType));
+					prop.SetValue(result, value == null ? null : value.ToObjectInternal(prop.PropertyType));
 				}
 			}
 			else if (this is JsonArray)

Original file line number	Diff line number	Diff line change
`@@ -280,14 +280,14 @@ object ToObjectInternal(Type type)`
`280`	`280`	`if (!ContainsKey(field.Name))`
`281`	`281`	`continue;`
`282`	`282`	`var value = this[field.Name];`
`283`		`- field.SetValue(result, value.ToObjectInternal(field.FieldType));`
	`283`	`+ field.SetValue(result, value == null ? null : value.ToObjectInternal(field.FieldType));`
`284`	`284`	`}`
`285`	`285`	`foreach (var prop in type.GetProperties())`
`286`	`286`	`{`
`287`	`287`	`if (!ContainsKey(prop.Name))`
`288`	`288`	`continue;`
`289`	`289`	`var value = this[prop.Name];`
`290`		`- prop.SetValue(result, value.ToObjectInternal(prop.PropertyType));`
	`290`	`+ prop.SetValue(result, value == null ? null : value.ToObjectInternal(prop.PropertyType));`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`	`else if (this is JsonArray)`