diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2005-12-08 12:48:38 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2005-12-08 12:48:38 +0300 |
| commit | 7974be63226de4d0ecb30d11045514088ff90713 (patch) | |
| tree | ccb5605357af649b32d1411a974a37378a709af5 /mcs/class/System.XML | |
| parent | 0eee0d589c71883741e4fcd8b8bae1a53933a6a9 (diff) | |
2005-12-08 Atsushi Enomoto <atsushi@ximian.com>
* XmlReaderSettings.cs : Schemas will be created only when it is
required.
svn path=/trunk/mcs/; revision=54105
Diffstat (limited to 'mcs/class/System.XML')
| -rw-r--r-- | mcs/class/System.XML/System.Xml/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml/XmlReaderSettings.cs | 17 |
2 files changed, 19 insertions, 3 deletions
diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index 2657a2cfa27..fd0a97cc2ab 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -1,3 +1,8 @@ +2005-12-08 Atsushi Enomoto <atsushi@ximian.com> + + * XmlReaderSettings.cs : Schemas will be created only when it is + required. + 2005-12-08 Andrew Skiba <andrews@mainsoft.com> * IXmlNamespaceResolver.cs: delete TARGET_JVM, diff --git a/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs b/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs index 08cbe9eba22..cca3eb03231 100644 --- a/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs +++ b/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs @@ -52,6 +52,7 @@ namespace System.Xml private bool prohibitDtd; private XmlNameTable nameTable; private XmlSchemaSet schemas; + private bool schemasNeedsInitialization; private XsValidationFlags validationFlags; private ValidationType validationType; private XmlResolver xmlResolver; @@ -98,7 +99,8 @@ namespace System.Xml lineNumberOffset = 0; linePositionOffset = 0; prohibitDtd = true; - schemas = new XmlSchemaSet (); + schemas = null; + schemasNeedsInitialization = true; validationFlags = XsValidationFlags.ProcessIdentityConstraints | XsValidationFlags.AllowXmlAttributes; @@ -160,8 +162,17 @@ namespace System.Xml } public XmlSchemaSet Schemas { - get { return schemas; } - set { schemas = value; } + get { + if (schemasNeedsInitialization) { + schemas = new XmlSchemaSet (); + schemasNeedsInitialization = false; + } + return schemas; + } + set { + schemas = value; + schemasNeedsInitialization = false; + } } internal void SetSchemas (XmlSchemaSet schemas) |