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
@@ -44,6 +44,7 @@ using Newtonsoft.Json.Linq;
#if !NET20 #if !NET20
using System.Xml.Linq; using System.Xml.Linq;
#endif #endif
namespace Newtonsoft.Json.Tests.Converters namespace Newtonsoft.Json.Tests.Converters
@@ -1909,7 +1910,27 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual(xml.notNull.ToString(), w2.notNull.ToString()); Assert.AreEqual(xml.notNull.ToString(), w2.notNull.ToString());
} }
#endif #endif
[Test]
public void SerializeAndDeserializeXmlWithNamespaceInChildrenRootDontHaveNameSpace()
{
var xmlString = @"<root>
<b xmlns='http://www.example.com/ns'>Asd</b>
<c>AAA</c>
<test>adad</test>
</root>";
var xml = XElement.Parse(xmlString);
var json1 = JsonConvert.SerializeXNode(xml);
var xmlBack = JsonConvert.DeserializeObject<XElement>(json1);
var equals = XElement.DeepEquals(xmlBack, xml);
Assert.IsTrue(equals);
}
} }
} }
#endif #endif
@@ -1232,10 +1232,9 @@ namespace Newtonsoft.Json.Converters
if (reader.TokenType != JsonToken.EndObject) if (reader.TokenType != JsonToken.EndObject)
{ {
manager.PushScope(); manager.PushScope();
DeserializeNode(reader, document, manager, element); DeserializeNode(reader, document, manager, element);
manager.PopScope(); manager.PopScope();
manager.RemoveNamespace(string.Empty, manager.DefaultNamespace);
} }
} }
} }
@@ -1394,6 +1393,7 @@ namespace Newtonsoft.Json.Converters
} }
else else
{ {
finishedAttributes = true; finishedAttributes = true;
} }