Skip to content

Commit 6de367d

Browse files
committed
SafetyEnumerable - code cleanup
1 parent 44ede81 commit 6de367d

File tree

1 file changed

+10
-19
lines changed

1 file changed

+10
-19
lines changed

src/NHibernate/Util/SafetyEnumerable.cs

+10-19
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,29 @@ public class SafetyEnumerable<T> : IEnumerable<T>
1212
/*
1313
* This class was created to filter List<ISelectable> to an IEnumerable<Column>
1414
*/
15-
private readonly IEnumerable collection;
15+
private readonly IEnumerable _collection;
1616

1717
public SafetyEnumerable(IEnumerable collection)
1818
{
19-
this.collection = collection;
19+
_collection = collection;
2020
}
2121

22-
#region IEnumerable<T> Members
23-
24-
IEnumerator<T> IEnumerable<T>.GetEnumerator()
22+
public IEnumerator<T> GetEnumerator()
2523
{
26-
IEnumerator enumerator = collection.GetEnumerator();
27-
while(enumerator.MoveNext())
24+
var enumerator = _collection.GetEnumerator();
25+
while (enumerator.MoveNext())
2826
{
29-
object element = enumerator.Current;
27+
var element = enumerator.Current;
3028
if (element == null)
3129
yield return default(T);
32-
else
33-
if (typeof(T).IsAssignableFrom(element.GetType()))
34-
yield return (T) element;
30+
else if (element is T)
31+
yield return (T) element;
3532
}
3633
}
3734

38-
#endregion
39-
40-
#region IEnumerable Members
41-
42-
public IEnumerator GetEnumerator()
35+
IEnumerator IEnumerable.GetEnumerator()
4336
{
44-
return ((IEnumerable<T>)this).GetEnumerator();
37+
return GetEnumerator();
4538
}
46-
47-
#endregion
4839
}
4940
}

0 commit comments

Comments
 (0)