Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Updated Exception Handling for Collection<T> #23290

Merged
merged 5 commits into from
Mar 22, 2019
Merged

Updated Exception Handling for Collection<T> #23290

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc551bc
Updated Argument Helper param from list->collection since the paramet…
Mar 15, 2019
d43bad6
Updated exception message to use an out of range exception that doesn…
Mar 15, 2019
dd8dcd5
Simplified if statements that verify if the index is out of range
Mar 16, 2019
3b773d2
Updated if logic to be simplified using (uint)
Mar 16, 2019
a407608
Updated exception handling to throw ThrowHelper.ThrowArgumentOutOfRan…
Mar 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/System.Private.CoreLib/shared/System/Collections/ObjectModel/Collection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public T this[int index]
ThrowHelper.ThrowNotSupportedException(ExceptionResource.NotSupported_ReadOnlyCollection);
}

if (index < 0 || index >= items.Count)
if ((uint)index >= (uint)items.Count)
{
ThrowHelper.ThrowArgumentOutOfRange_IndexException();
}
Expand Down Expand Up @@ -108,7 +108,7 @@ public void Insert(int index, T item)
ThrowHelper.ThrowNotSupportedException(ExceptionResource.NotSupported_ReadOnlyCollection);
}

if (index < 0 || index > items.Count)
if ((uint)index > (uint)items.Count)
{
ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.index, ExceptionResource.ArgumentOutOfRange_ListInsert);
}
Expand All @@ -125,12 +125,12 @@ public void InsertRange(int index, IEnumerable<T> collection)

if (collection == null)
{
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.list);
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.collection);
}

if ((uint)index > (uint)items.Count)
SkyeHoefling marked this conversation as resolved.
Show resolved Hide resolved
{
ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.index, ExceptionResource.ArgumentOutOfRange_ListInsert);
ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.index, ExceptionResource.ArgumentOutOfRange_Index);
SkyeHoefling marked this conversation as resolved.
Show resolved Hide resolved
}

InsertItemsRange(index, collection);
Expand Down Expand Up @@ -198,7 +198,7 @@ public void ReplaceRange(int index, int count, IEnumerable<T> collection)

if (collection == null)
{
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.list);
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.collection);
}

ReplaceItemsRange(index, count, collection);
Expand All @@ -211,7 +211,7 @@ public void RemoveAt(int index)
ThrowHelper.ThrowNotSupportedException(ExceptionResource.NotSupported_ReadOnlyCollection);
}

if (index < 0 || index >= items.Count)
if ((uint)index >= (uint)items.Count)
{
ThrowHelper.ThrowArgumentOutOfRange_IndexException();
}
Expand Down