diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2010-01-22 09:20:41 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2010-01-22 09:20:41 +0300 |
| commit | 1a77eba231762b947d4f7844f3deed4db13c2609 (patch) | |
| tree | 14c035001de33bd2403a4625e626709e6788c9df /mcs/class/System.XML/System.Xml | |
| parent | 86a0bbefd9ecf6477dd599cae837397d7e79b201 (diff) | |
backport r150041.
svn path=/branches/mono-2-6/mcs/; revision=150042
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/XmlDocument.cs | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index e4a37364105..32db00fdcc3 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -1,3 +1,8 @@ +2010-01-22 Atsushi Enomoto <atsushi@ximian.com> + + * XmlDocument.cs : fix type check for optimal node creation. + Fixed bug #571336, #571226 and #572738. + 2010-01-15 Atsushi Enomoto <atsushi@ximian.com> * XmlConvert.cs : Do not ignore ticks which are less than a diff --git a/mcs/class/System.XML/System.Xml/XmlDocument.cs b/mcs/class/System.XML/System.Xml/XmlDocument.cs index c10c9ac79a6..9469b3259da 100644 --- a/mcs/class/System.XML/System.Xml/XmlDocument.cs +++ b/mcs/class/System.XML/System.Xml/XmlDocument.cs @@ -104,8 +104,8 @@ namespace System.Xml resolver = new XmlUrlResolver (); Type type = GetType (); - optimal_create_element = type.GetMethod ("CreateElement", optimal_create_types).DeclaringType == type; - optimal_create_attribute = type.GetMethod ("CreateAttribute", optimal_create_types).DeclaringType == type; + optimal_create_element = type.GetMethod ("CreateElement", optimal_create_types).DeclaringType == typeof (XmlDocument); + optimal_create_attribute = type.GetMethod ("CreateAttribute", optimal_create_types).DeclaringType == typeof (XmlDocument); } #endregion |