-Fixed deserializer attempting to populate JSON onto an object that was created with a non-default constructor

-Added GetResolvedPropertyName to DefaultContractResolver
This commit is contained in:
James Newton-King
2012-05-27 21:29:02 +12:00
parent 2fbf5f7808
commit aef0759038
9 changed files with 132 additions and 26 deletions
@@ -52,7 +52,7 @@ namespace Newtonsoft.Json.Converters
foreach (DataTable table in dataSet.Tables)
{
writer.WritePropertyName((resolver != null) ? resolver.ResolvePropertyName(table.TableName) : table.TableName);
writer.WritePropertyName((resolver != null) ? resolver.GetResolvedPropertyName(table.TableName) : table.TableName);
converter.WriteJson(writer, table, serializer);
}
@@ -56,7 +56,7 @@ namespace Newtonsoft.Json.Converters
if (serializer.NullValueHandling == NullValueHandling.Ignore && (row[column] == null || row[column] == DBNull.Value))
continue;
writer.WritePropertyName((resolver != null) ? resolver.ResolvePropertyName(column.ColumnName) : column.ColumnName);
writer.WritePropertyName((resolver != null) ? resolver.GetResolvedPropertyName(column.ColumnName) : column.ColumnName);
serializer.Serialize(writer, row[column]);
}
writer.WriteEndObject();