Merge pull request #161 from LogosBible/master

Fix bug #311: On LinkedList.Clear, detach each node instead of dropping them en masse.
mono · Aug 18, 2011 · d23d8aa · d23d8aa
2 parents 1fe0e5f + e787a12
commit d23d8aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/mcs/class/System/System.Collections.Generic/LinkedList.cs b/mcs/class/System/System.Collections.Generic/LinkedList.cs
@@ -182,9 +182,8 @@ public void AddLast (LinkedListNode <T> node)
 
 		public void Clear ()
 		{
-			count = 0;
-			first = null;
-			version++;
+			while (first != null)
+				RemoveLast();
 		}
 
 		public bool Contains (T value)

diff --git a/mcs/class/System/Test/System.Collections.Generic/LinkedListTest.cs b/mcs/class/System/Test/System.Collections.Generic/LinkedListTest.cs
@@ -84,8 +84,13 @@ public void NonCircularNodeTest ()
 		[Test]
 		public void ClearTest ()
 		{
+			LinkedListNode <int> node = intlist.First;
 			intlist.Clear ();
+
 			Assert.AreEqual (0, intlist.Count);
+			Assert.AreEqual (2, node.Value);
+			Assert.IsNull (node.Next);
+			Assert.IsNull (node.Previous);
 		}
 
 		[Test]