re-enable ResolveEntity in XmlReader and derived classes

[mono.git] / mcs / class / System.XML / Mono.Xml / XmlFilterReader.cs

diff --git a/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs b/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs
index 412d6f18a574635b6acf9ea50c449ed816367915..5c367d290fa37054e30a28e846f5b075075372de 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs
+++ b/mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs
@@ -46,7 +46,7 @@ namespace Mono.Xml
                public XmlFilterReader (XmlReader reader, XmlReaderSettings settings)\r
                {\r
                        this.reader = reader;\r
-                       this.settings = settings;\r
+                       this.settings = settings.Clone ();\r
                        this.lineInfo = reader as IXmlLineInfo;\r
                }\r
 \r
@@ -96,9 +96,11 @@ namespace Mono.Xml
                        get { return reader.Prefix; }\r
                }\r
 \r
+#if !NET_2_1\r
                public override bool HasValue {\r
                        get { return reader.HasValue; }\r
                }\r
+#endif\r
 \r
                public override int Depth {\r
                        get { return reader.Depth; }\r
@@ -160,9 +162,11 @@ namespace Mono.Xml
                        get { return reader.NameTable; }\r
                }\r
 \r
+#if !NET_2_1\r
                public override IXmlSchemaInfo SchemaInfo {\r
                        get { return reader.SchemaInfo; }\r
                }\r
+#endif\r
 \r
                public override XmlReaderSettings Settings {\r
                        get { return settings; }\r
@@ -223,7 +227,8 @@ namespace Mono.Xml
 \r
                public override void Close ()\r
                {\r
-                       reader.Close ();\r
+                       if (settings.CloseInput)\r
+                               reader.Close ();\r
                }\r
 \r
                public override bool Read ()\r
@@ -275,9 +280,11 @@ namespace Mono.Xml
                        reader.ResolveEntity ();\r
                }\r
 \r
+#if !NET_2_1
                public override bool ReadAttributeValue () {\r
                        return reader.ReadAttributeValue ();\r
                }\r
+#endif\r
                #endregion\r
        }\r
 }\r