-Fixed comments in JSON sometimes causing errors when deserializing

This commit is contained in:
JamesNK
2011-03-26 01:25:10 +00:00
parent dffe08021d
commit b476a8d0fc
3 changed files with 60 additions and 8 deletions
@@ -634,6 +634,8 @@ namespace Newtonsoft.Json.Serialization
throw;
}
break;
case JsonToken.Comment:
break;
case JsonToken.EndObject:
contract.InvokeOnDeserialized(dictionary.UnderlyingDictionary, Serializer.Context);
@@ -742,6 +744,8 @@ namespace Newtonsoft.Json.Serialization
serializationInfo.AddValue(memberName, JToken.ReadFrom(reader));
break;
case JsonToken.Comment:
break;
case JsonToken.EndObject:
exit = true;
break;
@@ -897,6 +901,8 @@ namespace Newtonsoft.Json.Serialization
reader.Skip();
}
break;
case JsonToken.Comment:
break;
case JsonToken.EndObject:
exit = true;
break;
@@ -964,8 +970,14 @@ namespace Newtonsoft.Json.Serialization
return true;
}
#endif
return reader.Read();
do
{
if (!reader.Read())
return false;
} while (reader.TokenType == JsonToken.Comment);
return true;
}
private object PopulateObject(object newObject, JsonReader reader, JsonObjectContract contract, string id)