*** empty log message ***

[mono.git] / mcs / class / System.XML / System.Xml / XmlNodeReader.cs

diff --git a/mcs/class/System.XML/System.Xml/XmlNodeReader.cs b/mcs/class/System.XML/System.Xml/XmlNodeReader.cs
index 6336174eecede856dafd7388ee557e22557cf472..f77a2875e10388020c5e6398e194fb7aa2464d31 100755 (executable)
--- a/mcs/class/System.XML/System.Xml/XmlNodeReader.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNodeReader.cs
@@ -276,7 +276,10 @@ namespace System.Xml
                                if (current == null)
                                        return String.Empty;
 
-                               return current.Prefix;
+                               if (current.NodeType == XmlNodeType.Attribute)
+                                       return current.Prefix != String.Empty ? current.Prefix : null;
+                               else
+                                       return current.Prefix;
                        }
                }
 
@@ -781,8 +784,10 @@ namespace System.Xml
                        }
 
                        if (current.NodeType == XmlNodeType.Attribute) {
+                               if (current.FirstChild == null)
+                                       return false;
                                current = current.FirstChild;
-                               return current != null;
+                               return true;
                        } else if (current.ParentNode.NodeType == XmlNodeType.Attribute) {
                                if (current.NextSibling == null)
                                        return false;