diff options
author | JamesNK <james@newtonking.com> | 2010-12-23 22:27:38 +0300 |
---|---|---|
committer | JamesNK <james@newtonking.com> | 2010-12-23 22:27:38 +0300 |
commit | 2c92f69c741fd5443f1b24cbd4efd45b67ea4948 (patch) | |
tree | 3e7077745b9aa72bda9d3b001bc4e44a0963fbce /Src/Newtonsoft.Json | |
parent | c046ac36f9d75b379c37ff9aa3b28c1c3bbb7b3c (diff) |
-Fixed JsonNet35BinaryCompatibility spelling
-Fixed Specified properties incorrectly needing XmlIgnore attribute
Diffstat (limited to 'Src/Newtonsoft.Json')
-rw-r--r-- | Src/Newtonsoft.Json/Bson/BsonReader.cs | 10 | ||||
-rw-r--r-- | Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/Src/Newtonsoft.Json/Bson/BsonReader.cs b/Src/Newtonsoft.Json/Bson/BsonReader.cs index 0401984..b187337 100644 --- a/Src/Newtonsoft.Json/Bson/BsonReader.cs +++ b/Src/Newtonsoft.Json/Bson/BsonReader.cs @@ -55,7 +55,7 @@ namespace Newtonsoft.Json.Bson private ContainerContext _currentContext;
private bool _readRootValueAsArray;
- private bool _jsonNet35BinaryCompadibility;
+ private bool _jsonNet35BinaryCompatibility;
private DateTimeKind _dateTimeKindHandling;
private enum BsonReaderState
@@ -89,10 +89,10 @@ namespace Newtonsoft.Json.Bson /// <value>
/// <c>true</c> if binary data reading will be compatible with incorrect Json.NET 3.5 written binary; otherwise, <c>false</c>.
/// </value>
- public bool JsonNet35BinaryCompadibility
+ public bool JsonNet35BinaryCompatibility
{
- get { return _jsonNet35BinaryCompadibility; }
- set { _jsonNet35BinaryCompadibility = value; }
+ get { return _jsonNet35BinaryCompatibility; }
+ set { _jsonNet35BinaryCompatibility = value; }
}
/// <summary>
@@ -543,7 +543,7 @@ namespace Newtonsoft.Json.Bson #pragma warning disable 612,618
// the old binary type has the data length repeated in the data for some reason
- if (binaryType == BsonBinaryType.Data && !_jsonNet35BinaryCompadibility)
+ if (binaryType == BsonBinaryType.Data && !_jsonNet35BinaryCompatibility)
{
dataLength = ReadInt32();
}
diff --git a/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs b/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs index 2483de3..141782b 100644 --- a/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs +++ b/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs @@ -742,9 +742,7 @@ namespace Newtonsoft.Json.Serialization if (specifiedMember == null)
specifiedMember = member.DeclaringType.GetField(member.Name + JsonTypeReflector.SpecifiedPostfix);
- if (specifiedMember == null || ReflectionUtils.GetMemberUnderlyingType(specifiedMember) != typeof(bool)
- || (ReflectionUtils.GetAttribute<XmlIgnoreAttribute>(specifiedMember) == null
- && ReflectionUtils.GetAttribute<JsonIgnoreAttribute>(specifiedMember) == null))
+ if (specifiedMember == null || ReflectionUtils.GetMemberUnderlyingType(specifiedMember) != typeof(bool))
{
return;
}
|