diff options
| author | Alan McGovern <alan.mcgovern@gmail.com> | 2009-02-23 17:33:20 +0300 |
|---|---|---|
| committer | Alan McGovern <alan.mcgovern@gmail.com> | 2009-02-23 17:33:20 +0300 |
| commit | 10831124e75dac2a7c9d8b16cb5e9edf2c1cd6ed (patch) | |
| tree | 03731010747f786f3fd44c362953ab24a04864d1 /mcs/class/System.XML/System.Xml | |
| parent | 49b0d8cc2517656a37b6483fedde445143a3c84d (diff) | |
2009-02-23 Alan McGovern <amcgovern@novell.com>
* XmlTextReader.cs: Under the SL2 profile, the default resolver
is a XmlXapResolver.
svn path=/trunk/mcs/; revision=127740
Diffstat (limited to 'mcs/class/System.XML/System.Xml')
| -rw-r--r-- | mcs/class/System.XML/System.Xml/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml/XmlTextReader.cs | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index d77d04bf15f..e28df623c27 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -1,3 +1,8 @@ +2009-02-23 Alan McGovern <amcgovern@novell.com> + + * XmlTextReader.cs: Under the SL2 profile, the default resolver + is a XmlXapResolver. + 2009-02-23 Atsushi Enomoto <atsushi@ximian.com> * XmlReader.cs : ReadContentAsXxx() should not advance XmlReader diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader.cs b/mcs/class/System.XML/System.Xml/XmlTextReader.cs index f80ef81c2f6..0e729d162a3 100644 --- a/mcs/class/System.XML/System.Xml/XmlTextReader.cs +++ b/mcs/class/System.XML/System.Xml/XmlTextReader.cs @@ -129,9 +129,13 @@ namespace System.Xml // argument is uri, not an xml fragment. internal XmlTextReader (bool dummy, XmlResolver resolver, string url, XmlNodeType fragType, XmlParserContext context) { - if (resolver == null) + if (resolver == null) { +#if NET_2_1 + resolver = new XmlXapResolver (); +#else resolver = new XmlUrlResolver (); - +#endif + } this.XmlResolver = resolver; string uriString; Stream stream = GetStreamFromUrl (url, out uriString); @@ -950,7 +954,11 @@ namespace System.Xml // These values are never re-initialized. private bool namespaces = true; private WhitespaceHandling whitespaceHandling = WhitespaceHandling.All; +#if NET_2_1 + private XmlResolver resolver = new XmlXapResolver (); +#else private XmlResolver resolver = new XmlUrlResolver (); +#endif private bool normalization = false; private bool checkCharacters; |