Fixed things

Author: davidfowl

src/Http/Http/src/Authentication/DefaultAuthenticationManager.cs

@@ -26,7 +26,7 @@ public sealed class DefaultHttpContext : HttpContext
 
         private DefaultHttpRequest _request;
         private DefaultHttpResponse _response;
-        
+
         private DefaultConnectionInfo _connection;
         private DefaultWebSocketManager _websockets;
 
@@ -39,45 +39,28 @@ public DefaultHttpContext()
 
         public DefaultHttpContext(IFeatureCollection features)
         {
-            Initialize(features);
+            _features = new FeatureReferences<FeatureInterfaces>(features);
+            _request = new DefaultHttpRequest(this);
+            _response = new DefaultHttpResponse(this);
         }
 
         public void Initialize(IFeatureCollection features)
         {
             _features = new FeatureReferences<FeatureInterfaces>(features);
-
-            if (_request is null)
-            {
-                _request = new DefaultHttpRequest(this);
-            }
-            else
-            {
-                _request.Initialize(this);
-            }
-
-            if (_response is null)
-            {
-                _response = new DefaultHttpResponse(this);
-            }
-            else
-            {
-                _response.Initialize(this);
-            }
-
-            // Only set the ConnectionInfo if it was already allocated
+            _request.Initialize(this);
+            _response.Initialize(this);
             _connection?.Initialize(features);
+            _websockets?.Initialize(features);
         }
 
         public void Uninitialize()
         {
             _features = default;
 
-            _request?.Uninitialize();
-            _response?.Uninitialize();
+            _request.Uninitialize();
+            _response.Uninitialize();
             _connection?.Uninitialize();
             _websockets?.Uninitialize();
-
-            _websockets = null;
         }
 
         private IItemsFeature ItemsFeature =>

src/Http/Http/src/DefaultHttpContext.cs

@@ -55,7 +55,7 @@ private static HttpContext CreateHttpContext(IFeatureCollection featureCollectio
                 return container.HttpContext;
             }
 
-            return new ReusableHttpContext(featureCollection);
+            return new DefaultHttpContext(featureCollection);
         }
 
         public void Dispose(HttpContext httpContext)

src/Http/Http/src/HttpContextFactory.cs

@@ -20,15 +20,15 @@ public sealed class DefaultHttpRequest : HttpRequest
         private readonly static Func<IFeatureCollection, IRequestCookiesFeature> _newRequestCookiesFeature = f => new RequestCookiesFeature(f);
         private readonly static Func<IFeatureCollection, IRouteValuesFeature> _newRouteValuesFeature = f => new RouteValuesFeature();
 
-        private HttpContext _context;
+        private DefaultHttpContext _context;
         private FeatureReferences<FeatureInterfaces> _features;
 
-        public DefaultHttpRequest(HttpContext context)
+        public DefaultHttpRequest(DefaultHttpContext context)
         {
             Initialize(context);
         }
 
-        public void Initialize(HttpContext context)
+        public void Initialize(DefaultHttpContext context)
         {
             _context = context;
             _features = new FeatureReferences<FeatureInterfaces>(context.Features);

src/Http/Http/src/Internal/DefaultHttpRequest.cs

@@ -15,15 +15,15 @@ public sealed class DefaultHttpResponse : HttpResponse
         private readonly static Func<IFeatureCollection, IHttpResponseFeature> _nullResponseFeature = f => null;
         private readonly static Func<IFeatureCollection, IResponseCookiesFeature> _newResponseCookiesFeature = f => new ResponseCookiesFeature(f);
 
-        private HttpContext _context;
+        private DefaultHttpContext _context;
         private FeatureReferences<FeatureInterfaces> _features;
 
-        public DefaultHttpResponse(HttpContext context)
+        public DefaultHttpResponse(DefaultHttpContext context)
         {
             Initialize(context);
         }
 
-        public void Initialize(HttpContext context)
+        public void Initialize(DefaultHttpContext context)
         {
             _context = context;
             _features = new FeatureReferences<FeatureInterfaces>(context.Features);
@@ -32,7 +32,7 @@ public void Initialize(HttpContext context)
         public void Uninitialize()
         {
             _context = null;
-            _features = default(FeatureReferences<FeatureInterfaces>);
+            _features = default;
         }
 
         private IHttpResponseFeature HttpResponseFeature =>