Fix bug in BlockingCollection<T>.TryTake Add corresponding unit test

diff --git a/mcs/class/System/System.Collections.Concurrent/BlockingCollection.cs b/mcs/class/System/System.Collections.Concurrent/BlockingCollection.cs
index 75d7784cfbbb28b6dbb369d38ebd893e40230d99..56fcf1cb0ad2886ea511b995b21101a05e419f6a 100644 (file)
--- a/mcs/class/System/System.Collections.Concurrent/BlockingCollection.cs
+++ b/mcs/class/System/System.Collections.Concurrent/BlockingCollection.cs
@@ -269,6 +269,7 @@ namespace System.Collections.Concurrent
 
                                if (!mreRemove.IsSet)
                                        mreRemove.Set ();
+                               return true;
                        } while (contFunc ());
 
                        return false;

diff --git a/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs b/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs
index c9a5829a530d9895589c4c404050dfde73b9e970..b88479f3d973c19169c4d5b5878207be95e2ba11 100644 (file)
--- a/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs
+++ b/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs
@@ -166,6 +166,22 @@ namespace MonoTests.System.Collections.Concurrent
                        }
                        Assert.AreEqual(0, defaultCollection.Count, "#" + i);
                }
+
+               [TestAttribute]
+               public void TryTakeTestCase ()
+               {
+                       defaultCollection.Add (1);
+
+                       int value = default (int);
+                       bool firstTake = defaultCollection.TryTake (out value);
+                       int value2 = default (int);
+                       bool secondTake = defaultCollection.TryTake (out value2);
+
+                       Assert.AreEqual (1, value);
+                       Assert.IsTrue (firstTake);
+                       Assert.AreEqual (default (int), value2);
+                       Assert.IsFalse (secondTake);
+               }
        }
 }
 #endif