2009-07-22 Atsushi Enomoto <atsushi@ximian.com>

	* SerializationMap.cs : call MoveToContent() before examining
	  the reader node type.

	* XmlObjectSerializerTest.cs : now we can make xml indented as
	  originally done in #524088.

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

diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog
index b37cf5b948be396f1e40e4258e0a2a4ebf7c8b18..c4fd3308837313ece1846c1cddbf104b93ea54a5 100755 (executable)
--- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog
+++ b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-22  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * SerializationMap.cs : call MoveToContent() before examining
+         the reader node type.
+
 2009-07-22  Atsushi Enomoto  <atsushi@ximian.com>
 
        * KnownTypeCollection.cs : Find KnownTypeAttributes in base types

diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/SerializationMap.cs b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/SerializationMap.cs
index c2e0b46dc9c2c66283cf7c891491e8d9da9f887f..70308bd506a1abe811c8c81ac96d7533d3cbb343 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/SerializationMap.cs
+++ b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/SerializationMap.cs
@@ -341,6 +341,7 @@ namespace System.Runtime.Serialization
                {
                        bool isEmpty = reader.IsEmptyElement;
                        reader.ReadStartElement ();
+                       reader.MoveToContent ();
 
                        object res;
 

diff --git a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/ChangeLog b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/ChangeLog
index eaaadd35f7f99dd1853ee6a4ae5744e2b63d652c..c5fcedb56af6b5523a3170d87bb20692072327f8 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/ChangeLog
+++ b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-22  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * XmlObjectSerializerTest.cs : now we can make xml indented as
+         originally done in #524088.
+
 2009-07-22  Atsushi Enomoto  <atsushi@ximian.com>
 
        * XmlObjectSerializerTest.cs : added test for bug #524088 by

diff --git a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs
index aa764353961bd23433c5a1ae40240152dcd133e9..cf49a89d7913ae579e8ea03225ac6e892ad5f42d 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs
+++ b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs
@@ -1209,7 +1209,14 @@ namespace MonoTests.System.Runtime.Serialization
                public void BaseKnownTypeAttributes ()
                {
                        // bug #524088
-                       string xml = @"<DummyPlaylist xmlns='http://example.com/schemas/asx'><Entries><DummyEntry><EntryInfo xmlns:i='http://www.w3.org/2001/XMLSchema-instance' i:type='PartDummyEntryInfo'/></DummyEntry></Entries></DummyPlaylist>";
+                       string xml = @"
+<DummyPlaylist xmlns='http://example.com/schemas/asx'>
+  <Entries>
+    <DummyEntry>
+      <EntryInfo xmlns:i='http://www.w3.org/2001/XMLSchema-instance' i:type='PartDummyEntryInfo'/>
+    </DummyEntry>
+  </Entries>
+</DummyPlaylist>";
 
                        using (XmlReader reader = XmlReader.Create (new StringReader (xml))) {
                                DummyPlaylist playlist = new DataContractSerializer(typeof(DummyPlaylist)).ReadObject(reader) as DummyPlaylist;