Merge branch 'master' of https://github.com/ygalbel/Newtonsoft.Json into ygalbel-master

This commit is contained in:
James Newton-King
2014-02-23 11:20:18 +13:00
2 changed files with 24 additions and 3 deletions
@@ -1232,10 +1232,9 @@ namespace Newtonsoft.Json.Converters
if (reader.TokenType != JsonToken.EndObject)
{
manager.PushScope();
DeserializeNode(reader, document, manager, element);
manager.PopScope();
manager.RemoveNamespace(string.Empty, manager.DefaultNamespace);
}
}
}
@@ -1394,6 +1393,7 @@ namespace Newtonsoft.Json.Converters
}
else
{
finishedAttributes = true;
}