Merge pull request #2417 from razzfazz/guard_substr

[mono.git] / mcs / class / Microsoft.Build / Microsoft.Build.Internal / CollectionFromEnumerable.cs

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Internal/CollectionFromEnumerable.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Internal/CollectionFromEnumerable.cs
index 1c299d81d220df83e63d02ed66eaf141bd600326..3c2f6f7bc4b2e6aeb1b8085116d186c1021d94ee 100644 (file)
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Internal/CollectionFromEnumerable.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Internal/CollectionFromEnumerable.cs
@@ -54,11 +54,19 @@ namespace Microsoft.Build.Internal
 
                 public bool Contains (T item)
                 {
+                        List<T> backingList = backingEnumerable as List<T>;
+                        if (backingList != null)
+                                return backingList.Contains (item);
                         return backingEnumerable.Contains (item);
                 }
 
                 public void CopyTo (T[] array, int arrayIndex)
                 {
+                        List<T> backingList = backingEnumerable as List<T>;
+                        if (backingList != null) {
+                                backingList.CopyTo (array, arrayIndex);
+                                return;
+                        }
                         int i = arrayIndex;
                         foreach (var item in backingEnumerable) {
                                 array[i++] = item;
@@ -67,7 +75,10 @@ namespace Microsoft.Build.Internal
 
                 public int Count {
                         get {
-                                throw new NotImplementedException ();
+                                var backingList = backingEnumerable as List<T>;
+                                if(backingList == null)
+                                        backingEnumerable = backingList = new List<T> (backingEnumerable);
+                                return backingList.Count;
                         }
                 }