From 4b5e9e6b7098cfc12506f451064e0e97c0a84ce6 Mon Sep 17 00:00:00 2001 From: Justin Van Patten Date: Fri, 27 Nov 2015 14:46:07 -0800 Subject: [PATCH] Remove unnecessary null checks from KeyedCollection Contains and Remove already throw if the key is null, so there's no need for additional null checks later in these methods. --- .../System/Collections/ObjectModel/KeyedCollection.cs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/mscorlib/src/System/Collections/ObjectModel/KeyedCollection.cs b/src/mscorlib/src/System/Collections/ObjectModel/KeyedCollection.cs index efd8435..98dd603 100644 --- a/src/mscorlib/src/System/Collections/ObjectModel/KeyedCollection.cs +++ b/src/mscorlib/src/System/Collections/ObjectModel/KeyedCollection.cs @@ -79,10 +79,8 @@ namespace System.Collections.ObjectModel return dict.ContainsKey(key); } - if (key != null) { - foreach (TItem item in Items) { - if (comparer.Equals(GetKeyForItem(item), key)) return true; - } + foreach (TItem item in Items) { + if (comparer.Equals(GetKeyForItem(item), key)) return true; } return false; } @@ -114,12 +112,10 @@ namespace System.Collections.ObjectModel return false; } - if (key != null) { - for (int i = 0; i < Items.Count; i++) { - if (comparer.Equals(GetKeyForItem(Items[i]), key)) { - RemoveItem(i); - return true; - } + for (int i = 0; i < Items.Count; i++) { + if (comparer.Equals(GetKeyForItem(Items[i]), key)) { + RemoveItem(i); + return true; } } return false; -- 2.7.4