Bladeren bron

2008-09-19 Atsushi Enomoto <[email protected]>

        * XmlSerializer.cs : revert previous change and fix sys.data tests.


svn path=/trunk/mcs/; revision=113521
Atsushi Eno 17 jaren geleden
bovenliggende
commit
11ab97e09f

+ 4 - 0
mcs/class/System.XML/System.Xml.Serialization/ChangeLog

@@ -1,3 +1,7 @@
+2008-09-19  Atsushi Enomoto  <[email protected]>
+
+	* XmlSerializer.cs : revert previous change and fix sys.data tests.
+
 2008-09-17  Atsushi Enomoto  <[email protected]>
 2008-09-17  Atsushi Enomoto  <[email protected]>
 
 
 	* XmlSerializer.cs : in 2.0 profile it seems to create XmlReader
 	* XmlSerializer.cs : in 2.0 profile it seems to create XmlReader

+ 0 - 10
mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs

@@ -323,28 +323,18 @@ namespace System.Xml.Serialization
 
 
 		public object Deserialize (Stream stream)
 		public object Deserialize (Stream stream)
 		{
 		{
-#if NET_2_0
-			var s = new XmlReaderSettings () { IgnoreWhitespace = true };
-			return Deserialize (XmlReader.Create (stream, s));
-#else
 			XmlTextReader xmlReader = new XmlTextReader(stream);
 			XmlTextReader xmlReader = new XmlTextReader(stream);
 			xmlReader.Normalization = true;
 			xmlReader.Normalization = true;
 			xmlReader.WhitespaceHandling = WhitespaceHandling.Significant;
 			xmlReader.WhitespaceHandling = WhitespaceHandling.Significant;
 			return Deserialize(xmlReader);
 			return Deserialize(xmlReader);
-#endif
 		}
 		}
 
 
 		public object Deserialize (TextReader textReader)
 		public object Deserialize (TextReader textReader)
 		{
 		{
-#if NET_2_0
-			var s = new XmlReaderSettings () { IgnoreWhitespace = true };
-			return Deserialize (XmlReader.Create (textReader, s));
-#else
 			XmlTextReader xmlReader = new XmlTextReader(textReader);
 			XmlTextReader xmlReader = new XmlTextReader(textReader);
 			xmlReader.Normalization = true;
 			xmlReader.Normalization = true;
 			xmlReader.WhitespaceHandling = WhitespaceHandling.Significant;
 			xmlReader.WhitespaceHandling = WhitespaceHandling.Significant;
 			return Deserialize(xmlReader);
 			return Deserialize(xmlReader);
-#endif
 		}
 		}
 
 
 		public object Deserialize (XmlReader xmlReader)
 		public object Deserialize (XmlReader xmlReader)