X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.XML%2FSystem.Xml%2FXmlLinkedNode.cs;h=cc6be542fd446b6cd69324dfa922a9fbb33b7789;hb=f00c428bbe9dd976f1c36ababcd2bb406d2bca33;hp=090bedcf6b924e0235ad7635a195c3284cbbc1e3;hpb=4d82c52aebf33ced1d8b934323eccbb905419a9e;p=mono.git

diff --git a/mcs/class/System.XML/System.Xml/XmlLinkedNode.cs b/mcs/class/System.XML/System.Xml/XmlLinkedNode.cs
index 090bedcf6b9..cc6be542fd4 100644
--- a/mcs/class/System.XML/System.Xml/XmlLinkedNode.cs
+++ b/mcs/class/System.XML/System.Xml/XmlLinkedNode.cs
@@ -7,7 +7,7 @@
 //
 // (C) 2002 Jason Diamond, Kral Ferch
 //
-
+
 using System;
 
 namespace System.Xml
@@ -17,6 +17,7 @@ namespace System.Xml
 		#region Fields
 
 		XmlLinkedNode nextSibling;
+		XmlLinkedNode lastLinkedChild;
 
 		#endregion
 
@@ -30,7 +31,10 @@ namespace System.Xml
 		public override XmlNode NextSibling
 		{
 			get {
-				if (Object.ReferenceEquals(nextSibling, ParentNode.LastLinkedChild.NextLinkedSibling) == false) {
+				if(ParentNode == null) {
+					return null;
+				}
+				else if (Object.ReferenceEquals(nextSibling, ParentNode.LastLinkedChild.NextLinkedSibling) == false) {
 					return nextSibling;
 				}
 				else {
@@ -61,6 +65,13 @@ namespace System.Xml
 			}
 		}
 
+		// copied this way from XmlElement
+		internal override XmlLinkedNode LastLinkedChild
+		{
+			get { return lastLinkedChild; }
+			set { lastLinkedChild = value; }
+		}
+
 		#endregion
 	}
 }