diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2009-03-16 21:04:51 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2009-03-16 21:04:51 +0300 |
| commit | af866ca922c15ddf3145b6d9cd547eb6c2e2ab2d (patch) | |
| tree | c7873416bbeabc5a35d68c6f7dd909789e2a537a /mcs/class/System.XML/System.Xml | |
| parent | c45153282b8ed566c0bc304338be5c34a7b7a3c5 (diff) | |
2009-03-16 Atsushi Enomoto <atsushi@ximian.com>
* XmlParserContext.cs : .NET has weird nametable initialization.
Fixed bug #484519.
* XmlParserContextTests.cs : added test for bug #484519.
svn path=/trunk/mcs/; revision=129483
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/XmlParserContext.cs | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index e84fced16c6..2f60e36a570 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -1,5 +1,10 @@ 2009-03-16 Atsushi Enomoto <atsushi@ximian.com> + * XmlParserContext.cs : .NET has weird nametable initialization. + Fixed bug #484519. + +2009-03-16 Atsushi Enomoto <atsushi@ximian.com> + * XmlReader.cs : (ReadToFollowing) check LocalName, not Name. Fixed bug #478506. diff --git a/mcs/class/System.XML/System.Xml/XmlParserContext.cs b/mcs/class/System.XML/System.Xml/XmlParserContext.cs index ff8159dae01..6a1a20ee487 100644 --- a/mcs/class/System.XML/System.Xml/XmlParserContext.cs +++ b/mcs/class/System.XML/System.Xml/XmlParserContext.cs @@ -156,9 +156,8 @@ namespace System.Xml XmlSpace xmlSpace, Encoding enc) { - this.nameTable = nt; - this.namespaceManager = nsMgr; + this.nameTable = nt != null ? nt : nsMgr != null ? nsMgr.NameTable : null; if (dtd != null) { this.DocTypeName = dtd.Name; this.PublicId = dtd.PublicId; |