Merge pull request #1069 from esdrubal/bug16990

Changed ConcurrentDictionary.Contains(KeyValuePair) to also compare value. Fixes #16990.

diff --git a/mcs/class/corlib/System.Collections.Concurrent/ConcurrentDictionary.cs b/mcs/class/corlib/System.Collections.Concurrent/ConcurrentDictionary.cs
index e5a26ce28d3577b53d240dec40c7b0e96d189f9e..8098cdbc5828bfd6e7cd188e3bab68dd4127b619 100644 (file)
--- a/mcs/class/corlib/System.Collections.Concurrent/ConcurrentDictionary.cs
+++ b/mcs/class/corlib/System.Collections.Concurrent/ConcurrentDictionary.cs
@@ -262,7 +262,11 @@ namespace System.Collections.Concurrent
 
                bool ICollection<KeyValuePair<TKey,TValue>>.Contains (KeyValuePair<TKey, TValue> pair)
                {
-                       return ContainsKey (pair.Key);
+                       TValue value;
+                       if (!TryGetValue (pair.Key, out value))
+                               return false;
+
+                       return EqualityComparer<TValue>.Default.Equals (value, pair.Value);
                }
 
                public KeyValuePair<TKey,TValue>[] ToArray ()

diff --git a/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs b/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs
index 698a25588f63abdaca2e1f7553533ca6fc5e512a..e38c904590094c4d205afd198fea736b31ea4bdd 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs
+++ b/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs
@@ -353,6 +353,19 @@ namespace MonoTests.System.Collections.Concurrent
                        } catch (ArgumentNullException ex) {
                        }
                }
+               
+               [Test]
+               public void ContainsKeyPairTest ()
+               {
+                       var validKeyPair = new KeyValuePair<string, string> ("key", "validValue");
+                       var wrongKeyPair = new KeyValuePair<string, string> ("key", "wrongValue");
+
+                       IDictionary<string, string> dict = new ConcurrentDictionary<string, string> ();
+                       dict.Add (validKeyPair);
+
+                       Assert.IsTrue (dict.Contains (validKeyPair));
+                       Assert.IsFalse (dict.Contains (wrongKeyPair));
+               }
        }
 }
 #endif