2010-06-16 Atsushi Enomoto <atsushi@ximian.com>

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

svn path=/trunk/mcs/; revision=159019

diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter.cs
index a845ae22ce3ff8a8975dd88c4e65f790d96bc893..3af44ddf3db6da8322be461642376f8c7539106a 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter.cs
+++ b/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

diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/ChangeLog b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/ChangeLog
index 5337f5244275926f0cbc5ae4222abe39cc97c89f..7783d591f4622c9a09cced0424964dac07c1a5c8 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/ChangeLog
+++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-16  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * Atom10ItemFormatter.cs : Fix reading of "source" element to not
+         expect feed element (ReadFrom() expects it). Fixed bug #614596.
+
 2010-06-07  Carlos Martin Nieto  <carlos@cmartin.tk>
 
        * Rss20ItemFormatter.cs: Don't assume guids are permalinks