re-enable ResolveEntity in XmlReader and derived classes

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

diff --git a/mcs/class/System.XML/Mono.Xml/ChangeLog b/mcs/class/System.XML/Mono.Xml/ChangeLog
index bf3ccddc81fd7d4cfd198e3a495c411c598d6146..d90de9f56c209a03e53cea2b5f13e434e3160471 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml/ChangeLog
+++ b/mcs/class/System.XML/Mono.Xml/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-21  Stephane Delcroix  <sdelcroix@novell.com>
+
+       * SubtreeXmlReader.cs
+       * XmlFilterReader.cs: re-enable ResolveEntity for 2.1
+
 2008-05-07  Atsushi Enomoto <atsushi@ximian.com>
 
        * XmlFilterReader.cs : clone settings so that it does not depend on

diff --git a/mcs/class/System.XML/Mono.Xml/SubtreeXmlReader.cs b/mcs/class/System.XML/Mono.Xml/SubtreeXmlReader.cs
index 1f1880016ac5532864ae92dad7738d994196e242..3003351fd0333bfaed830e711f74ed8a084d9b82 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml/SubtreeXmlReader.cs
+++ b/mcs/class/System.XML/Mono.Xml/SubtreeXmlReader.cs
@@ -237,6 +237,7 @@ namespace Mono.Xml
                                return false;
                        return Reader.ReadAttributeValue ();
                }
+#endif
 
                public override void ResolveEntity ()
                {
@@ -244,7 +245,6 @@ namespace Mono.Xml
                                return;
                        Reader.ResolveEntity ();
                }
-#endif
        }
 }
 

diff --git a/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs b/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs
index ae6b420dabeac1f525bfabeadeb6791a57ad687d..5c367d290fa37054e30a28e846f5b075075372de 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs
+++ b/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs
@@ -275,12 +275,12 @@ namespace Mono.Xml
                        return reader.LookupNamespace (prefix);\r
                }\r
 \r
-#if !NET_2_1\r
                public override void ResolveEntity ()\r
                {\r
                        reader.ResolveEntity ();\r
                }\r
 \r
+#if !NET_2_1
                public override bool ReadAttributeValue () {\r
                        return reader.ReadAttributeValue ();\r
                }\r

diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
index 29329188800606bb1b9cacce138c407a4b5a77c2..5f2801aeca4e96028d05d5a952ee60e3a072315b 100644 (file)
--- a/mcs/class/System.XML/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-21  Stephane Delcroix  <sdelcroix@novell.com>
+
+       * EnityResolvingXmlReader.cs:
+       * XmlReader.cs:
+       * XmlTextReader.cs:
+       * XmlTextReader2.cs: re-enable ResolveEntity for 2.1
+
 2008-08-21  Stephane Delcroix  <sdelcroix@novell.com>
 
        * XmlReaderSettings.cs: adding DtdProcessing and

diff --git a/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs b/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs
index 9f0891cc9176cf4ba73c74c2bd0a05dcc1ac5cd1..e476b9565706e3c840f632e8c0d16f33f6442dea 100644 (file)
--- a/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs
+++ b/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs
@@ -421,9 +421,7 @@ namespace Mono.Xml
                        return base.ReadString ();
                }
 
-#if !NET_2_1
                public override
-#endif
                void ResolveEntity ()
                {
 #if NET_2_0

diff --git a/mcs/class/System.XML/System.Xml/XmlReader.cs b/mcs/class/System.XML/System.Xml/XmlReader.cs
index 97f4e1ebdfeda6d746cfe027ea5f1dd6a6412031..5457bf5b9f3a9b67f97675ca03277e524844d870 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlReader.cs
+++ b/mcs/class/System.XML/System.Xml/XmlReader.cs
@@ -1281,9 +1281,7 @@ namespace System.Xml
                                binary = new XmlReaderBinarySupport (this);
                }
 
-#if !NET_2_1
                public abstract void ResolveEntity ();
-#endif
 
                public virtual void Skip ()
                {

diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader.cs b/mcs/class/System.XML/System.Xml/XmlTextReader.cs
index 08e866ca3189ee1cb50bdc0fb6f60d2bef57ad30..0c943d18f1e644d3ad332cadc86d85f1aba9ad94 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlTextReader.cs
+++ b/mcs/class/System.XML/System.Xml/XmlTextReader.cs
@@ -700,13 +700,11 @@ namespace System.Xml
                        Clear ();
                }
 
-#if !NET_2_1
                public override void ResolveEntity ()
                {
                        // XmlTextReader does not resolve entities.
                        throw new InvalidOperationException ("XmlTextReader cannot resolve external entities.");
                }
-#endif
 
 #if NET_2_0
                [MonoTODO] // FIXME: Implement, for performance improvement

diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader2.cs b/mcs/class/System.XML/System.Xml/XmlTextReader2.cs
index 82380c8339e634a7ccfa8e39a349063482c36cfa..aca100fa5c47d6c267085e9c48cdde191e92e8d5 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlTextReader2.cs
+++ b/mcs/class/System.XML/System.Xml/XmlTextReader2.cs
@@ -601,9 +601,7 @@ namespace System.Xml
                        source.ResetState ();
                }
 
-#if !NET_2_1
                public override
-#endif
                void ResolveEntity ()
                {
                        if (entity != null)