Skip to content

Commit 09dd500

Browse files
committed
address PR comments
1 parent d5e05e8 commit 09dd500

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

src/Http/Owin/src/DictionaryStringArrayWrapper.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ void ICollection<KeyValuePair<string, string[]>>.CopyTo(KeyValuePair<string, str
5555
}
5656
}
5757

58-
public Enumerator GetEnumerator() => new Enumerator(Inner);
58+
public ConvertingEnumerator GetEnumerator() => new ConvertingEnumerator(Inner);
5959

60-
IEnumerator<KeyValuePair<string, string[]>> IEnumerable<KeyValuePair<string, string[]>>.GetEnumerator() => new Enumerator(Inner);
60+
IEnumerator<KeyValuePair<string, string[]>> IEnumerable<KeyValuePair<string, string[]>>.GetEnumerator() => new ConvertingEnumerator(Inner);
6161

62-
IEnumerator IEnumerable.GetEnumerator() => new Enumerator(Inner);
62+
IEnumerator IEnumerable.GetEnumerator() => new ConvertingEnumerator(Inner);
6363

6464
bool ICollection<KeyValuePair<string, string[]>>.Remove(KeyValuePair<string, string[]> item) => Inner.Remove(Convert(item));
6565

@@ -77,12 +77,12 @@ bool IDictionary<string, string[]>.TryGetValue(string key, out string[] value)
7777
return false;
7878
}
7979

80-
public struct Enumerator : IEnumerator<KeyValuePair<string, string[]>>, IEnumerator
80+
public struct ConvertingEnumerator : IEnumerator<KeyValuePair<string, string[]>>, IEnumerator
8181
{
8282
private IEnumerator<KeyValuePair<string, StringValues>> _inner;
8383
private KeyValuePair<string, string[]> _current;
8484

85-
internal Enumerator(IDictionary<string, StringValues> inner)
85+
internal ConvertingEnumerator(IDictionary<string, StringValues> inner)
8686
{
8787
_inner = inner.GetEnumerator();
8888
_current = default;

src/Http/Owin/src/DictionaryStringValuesWrapper.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ void ICollection<KeyValuePair<string, StringValues>>.CopyTo(KeyValuePair<string,
100100
}
101101
}
102102

103-
public Enumerator GetEnumerator() => new Enumerator(Inner);
103+
public ConvertingEnumerator GetEnumerator() => new ConvertingEnumerator(Inner);
104104

105-
IEnumerator<KeyValuePair<string, StringValues>> IEnumerable<KeyValuePair<string, StringValues>>.GetEnumerator() => new Enumerator(Inner);
105+
IEnumerator<KeyValuePair<string, StringValues>> IEnumerable<KeyValuePair<string, StringValues>>.GetEnumerator() => new ConvertingEnumerator(Inner);
106106

107-
IEnumerator IEnumerable.GetEnumerator() => new Enumerator(Inner);
107+
IEnumerator IEnumerable.GetEnumerator() => new ConvertingEnumerator(Inner);
108108

109109
bool ICollection<KeyValuePair<string, StringValues>>.Remove(KeyValuePair<string, StringValues> item) => Inner.Remove(Convert(item));
110110

@@ -122,12 +122,12 @@ bool IDictionary<string, StringValues>.TryGetValue(string key, out StringValues
122122
return false;
123123
}
124124

125-
public struct Enumerator : IEnumerator<KeyValuePair<string, StringValues>>, IEnumerator
125+
public struct ConvertingEnumerator : IEnumerator<KeyValuePair<string, StringValues>>, IEnumerator
126126
{
127127
private IEnumerator<KeyValuePair<string, string[]>> _inner;
128128
private KeyValuePair<string, StringValues> _current;
129129

130-
internal Enumerator(IDictionary<string, string[]> inner)
130+
internal ConvertingEnumerator(IDictionary<string, string[]> inner)
131131
{
132132
_inner = inner.GetEnumerator();
133133
_current = default;

src/Http/Owin/src/OwinEnvironment.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ public bool Remove(string key)
555555

556556
if (_entries.ContainsKey(key) || _contextDependentEntries.ContainsKey(key))
557557
{
558-
_deletedKeys ??= new HashSet<string>();
558+
_deletedKeys ??= new HashSet<string>(StringComparer.Ordinal);
559559
return _deletedKeys.Add(key);
560560
}
561561

@@ -606,11 +606,11 @@ void InitializeContextEntries(bool emptyCollection = false)
606606
{
607607
if (emptyCollection)
608608
{
609-
_contextEntries = new Dictionary<string, FeatureMap>();
609+
_contextEntries = new Dictionary<string, FeatureMap>(StringComparer.Ordinal);
610610
return;
611611
}
612612

613-
_contextEntries = new Dictionary<string, FeatureMap>(_entries);
613+
_contextEntries = new Dictionary<string, FeatureMap>(_entries, StringComparer.Ordinal);
614614
foreach (var entry in _contextDependentEntries)
615615
{
616616
_contextEntries[entry.Key] = entry.Value;

0 commit comments

Comments
 (0)