Author: atsushi
Date: 2005-03-07 15:24:49 -0500 (Mon, 07 Mar 2005)
New Revision: 41536

Modified:
   trunk/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog
   trunk/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder2.cs
Log:
2004-03-07  Atsushi Enomoto  <[EMAIL PROTECTED]>

        * DTMXPathDocumentBuilder2.cs : When there was an empty element and
          namespace declarations, the next element namespace index was
          incorrectly pointing to that of empty element.



Modified: trunk/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog 2005-03-07 18:45:26 UTC 
(rev 41535)
+++ trunk/mcs/class/System.XML/Mono.Xml.XPath/ChangeLog 2005-03-07 20:24:49 UTC 
(rev 41536)
@@ -1,3 +1,9 @@
+2004-03-07  Atsushi Enomoto  <[EMAIL PROTECTED]>
+
+       * DTMXPathDocumentBuilder2.cs : When there was an empty element and
+         namespace declarations, the next element namespace index was
+         incorrectly pointing to that of empty element.
+
 2004-02-21  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
        * DTMXPathDocumentBuilder2.cs : whitespace node values were not added

Modified: trunk/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder2.cs
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder2.cs       
2005-03-07 18:45:26 UTC (rev 41535)
+++ trunk/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder2.cs       
2005-03-07 20:24:49 UTC (rev 41536)
@@ -390,7 +390,8 @@
                                nodes [nodeIndex].FirstAttribute = 
attrIndexAtStart + 1;
                        if (nsIndexAtStart != nsIndex) {
                                nodes [nodeIndex].FirstNamespace = nsIndex;
-                               lastNsInScope = nsIndex;
+                               if (!xmlReader.IsEmptyElement)
+                                       lastNsInScope = nsIndex;
                        }
 
                        if (!nodes [nodeIndex].IsEmptyElement)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to