diff --git a/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs b/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs
index 41372093..832fde45 100644
--- a/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs
+++ b/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs
@@ -1202,7 +1202,7 @@ namespace Newtonsoft.Json.Tests.Converters
public void SerializeComment()
{
string xml = @"
- Text
+ Text
";
XmlDocument doc = new XmlDocument();
doc.LoadXml(xml);
@@ -1214,8 +1214,8 @@ namespace Newtonsoft.Json.Tests.Converters
""@class"": ""vevent"",
""a"": {
""@class"": ""url"",
- ""@href"": ""http://www.web2con.com/"",
- ""#text"": ""Text""
+ ""@href"": ""http://www.web2con.com/""/* Hi */,
+ ""span"": ""Text""
}/* Hi! */
}
}";
@@ -1223,7 +1223,7 @@ namespace Newtonsoft.Json.Tests.Converters
StringAssert.AreEqual(expected, jsonText);
XmlDocument newDoc = (XmlDocument)DeserializeXmlNode(jsonText);
- Assert.AreEqual(@"Text", newDoc.InnerXml);
+ Assert.AreEqual(@"Text", newDoc.InnerXml);
}
[Test]
diff --git a/Src/Newtonsoft.Json/Converters/XmlNodeConverter.cs b/Src/Newtonsoft.Json/Converters/XmlNodeConverter.cs
index e607ae68..402fb764 100644
--- a/Src/Newtonsoft.Json/Converters/XmlNodeConverter.cs
+++ b/Src/Newtonsoft.Json/Converters/XmlNodeConverter.cs
@@ -1580,6 +1580,9 @@ namespace Newtonsoft.Json.Converters
case JsonToken.EndObject:
finishedElement = true;
break;
+ case JsonToken.Comment:
+ finishedElement = true;
+ break;
default:
throw new JsonSerializationException("Unexpected JsonToken: " + reader.TokenType);
}