-PR fixes

This commit is contained in:
James Newton-King
2015-03-29 21:22:42 +13:00
parent 00bbd96718
commit bc7350d12c
7 changed files with 79 additions and 38 deletions
@@ -56,11 +56,13 @@ namespace Newtonsoft.Json.Converters
writer.WriteStartObject();
foreach (DataColumn column in row.Table.Columns)
{
if (serializer.NullValueHandling == NullValueHandling.Ignore && (row[column] == null || row[column] == DBNull.Value))
object columnValue = row[column];
if (serializer.NullValueHandling == NullValueHandling.Ignore && (columnValue == null || columnValue == DBNull.Value))
continue;
writer.WritePropertyName((resolver != null) ? resolver.GetResolvedPropertyName(column.ColumnName) : column.ColumnName);
serializer.Serialize(writer, row[column]);
serializer.Serialize(writer, columnValue);
}
writer.WriteEndObject();
}
@@ -165,7 +167,7 @@ namespace Newtonsoft.Json.Converters
}
else
{
dr[columnName] = reader.Value != null ? serializer.Deserialize(reader, column.DataType) : DBNull.Value;
dr[columnName] = (reader.Value != null) ? serializer.Deserialize(reader, column.DataType) : DBNull.Value;
}
CheckedRead(reader);
@@ -222,5 +224,4 @@ namespace Newtonsoft.Json.Converters
}
}
}
#endif
@@ -92,5 +92,5 @@ using System.Security;
// by using the '*' as shown below:
[assembly: AssemblyVersion("7.0.0.0")]
[assembly: AssemblyFileVersion("7.0.1.18322")]
[assembly: AssemblyFileVersion("7.0.1.18329")]
[assembly: CLSCompliant(true)]