From 8bf2399d112b51346ab9b6d7c8cf3b8d731a04a6 Mon Sep 17 00:00:00 2001
From: Atsushi Eno <atsushieno@gmail.com>
Date: Wed, 22 Jul 2009 07:47:33 +0000
Subject: [PATCH] 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
---
 .../System.Runtime.Serialization/ChangeLog               | 5 +++++
 .../System.Runtime.Serialization/SerializationMap.cs     | 1 +
 .../Test/System.Runtime.Serialization/ChangeLog          | 5 +++++
 .../XmlObjectSerializerTest.cs                           | 9 ++++++++-
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog
index b37cf5b948b..c4fd3308837 100755
--- 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 c2e0b46dc9c..70308bd506a 100644
--- 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 eaaadd35f7f..c5fcedb56af 100644
--- 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 aa764353961..cf49a89d791 100644
--- 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;
-- 
2.25.1