Apply opt to non-generic

aspnet · Feb 11, 2018 · cbd2130 · cbd2130
1 parent d5d00e3
commit cbd2130
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Kestrel.Core/Internal/Http/HttpProtocol.Generated.cs b/src/Kestrel.Core/Internal/Http/HttpProtocol.Generated.cs
@@ -86,7 +86,7 @@ object IFeatureCollection.this[Type key]
         {
             get
             {
-                object feature;
+                object feature = null;
                 if (key == IHttpRequestFeatureType)
                 {
                     feature = _currentIHttpRequestFeature;
@@ -171,7 +171,7 @@ object IFeatureCollection.this[Type key]
                 {
                     feature = _currentIHttpSendFileFeature;
                 }
-                else
+                else if (MaybeExtra != null)
                 {
                     feature = ExtraFeatureGet(key);
                 }

diff --git a/tools/CodeGenerator/HttpProtocolFeatureCollection.cs b/tools/CodeGenerator/HttpProtocolFeatureCollection.cs
@@ -118,12 +118,12 @@ object IFeatureCollection.this[Type key]
         {{
             get
             {{
-                object feature;{Each(allFeatures, feature => $@"
+                object feature = null;{Each(allFeatures, feature => $@"
                 {(feature.Index != 0 ? "else " : "")}if (key == {feature.Name}Type)
                 {{
                     feature = _current{feature.Name};
                 }}")}
-                else
+                else if (MaybeExtra != null)
                 {{
                     feature = ExtraFeatureGet(key);
                 }}