diff options
| -rw-r--r-- | mcs/class/System.XML/System.Xml/ChangeLog | 6 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index b54c25751b5..f75061e59cd 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -1,3 +1,9 @@ +2002-08-03 Tim Coleman <tim@timcoleman.com> + * XmlNamespaceManager.cs: + .Net allows the empty namespace to be redefined + at a later point, but the current implementation + did not. This fixes a hashtable conflict. + 2002-07-26 Tim Coleman <tim@timcoleman.com> * XmlTextWriter.cs: When given a textwriter, check to see if it has a diff --git a/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs index 56dcaf5d88c..745a1f5cca4 100644 --- a/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs +++ b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs @@ -65,7 +65,10 @@ namespace System.Xml if (currentScope.Namespaces == null) currentScope.Namespaces = new Hashtable (); - currentScope.Namespaces.Add (nameTable.Add (prefix), nameTable.Add (uri)); + if (prefix == String.Empty) + currentScope.Namespaces [prefix] = nameTable.Add (uri); + else + currentScope.Namespaces.Add (nameTable.Add (prefix), nameTable.Add (uri)); } [MonoTODO] |