diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2008-09-17 17:29:18 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2008-09-17 17:29:18 +0400 |
| commit | 0f484f3d35f6bd4dbfefe767fe552c2117790767 (patch) | |
| tree | 66df3739971bdb9116d83772ff78d94568e4d574 /mcs/class/System.XML/System.Xml.Serialization | |
| parent | 8fdbc78e3360ff3ba4ba61fcc0db62e653e1df51 (diff) | |
2008-09-17 Atsushi Enomoto <atsushi@ximian.com>
* XmlSerializer.cs : in 2.0 profile it seems to create XmlReader
for stream and textreader, that skips whitespaces.
svn path=/trunk/mcs/; revision=113307
Diffstat (limited to 'mcs/class/System.XML/System.Xml.Serialization')
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Serialization/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog index 135100200fb..0f0ffcc0f58 100644 --- a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog +++ b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog @@ -1,3 +1,8 @@ +2008-09-17 Atsushi Enomoto <atsushi@ximian.com> + + * XmlSerializer.cs : in 2.0 profile it seems to create XmlReader + for stream and textreader, that skips whitespaces. + 2008-09-02 Atsushi Enomoto <atsushi@ximian.com> * SerializationCodeGenerator.cs diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs index ba86f443a5b..3a4d6db8da4 100644 --- a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs +++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs @@ -323,18 +323,28 @@ namespace System.Xml.Serialization 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); xmlReader.Normalization = true; xmlReader.WhitespaceHandling = WhitespaceHandling.Significant; return Deserialize(xmlReader); +#endif } 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); xmlReader.Normalization = true; xmlReader.WhitespaceHandling = WhitespaceHandling.Significant; return Deserialize(xmlReader); +#endif } public object Deserialize (XmlReader xmlReader) |