Просмотр исходного кода

2010-06-16 Atsushi Enomoto <[email protected]>

	* Atom10ItemFormatter.cs : Fix reading of "source" element to not
	  expect feed element (ReadFrom() expects it). Fixed bug #614596.


svn path=/trunk/mcs/; revision=159019
Atsushi Eno 15 лет назад
Родитель
Сommit
a5eefdf642

+ 1 - 2
mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter.cs

@@ -380,9 +380,8 @@ namespace System.ServiceModel.Syndication
 		{
 			SyndicationFeed feed = null;
 			if (!reader.IsEmptyElement) {
-				reader.Read ();
 				Atom10FeedFormatter ff = new Atom10FeedFormatter ();
-				ff.ReadFrom (reader);
+				((IXmlSerializable) ff).ReadXml (reader); // this does not check the QName of the wrapping element.
 				feed = ff.Feed;
 			}
 			else

+ 5 - 0
mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/ChangeLog

@@ -1,3 +1,8 @@
+2010-06-16  Atsushi Enomoto  <[email protected]>
+
+	* Atom10ItemFormatter.cs : Fix reading of "source" element to not
+	  expect feed element (ReadFrom() expects it). Fixed bug #614596.
+
 2010-06-07  Carlos Martin Nieto  <[email protected]>
 
 	* Rss20ItemFormatter.cs: Don't assume guids are permalinks