Fixing logger nullref when context created with no feature #532

aspnet · Jan 12, 2016 · de66e88 · de66e88
1 parent 48451bd
commit de66e88
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/Microsoft.AspNet.TestHost/ClientHandler.cs b/src/Microsoft.AspNet.TestHost/ClientHandler.cs
@@ -124,12 +124,13 @@ internal RequestState(HttpRequestMessage request, PathString pathBase, IHttpAppl
                     request.Headers.Host = request.RequestUri.GetComponents(UriComponents.HostAndPort, UriFormat.UriEscaped);
                 }
 
-                Context = application.CreateContext(new FeatureCollection());
+                var contextFeatures = new FeatureCollection();
+                contextFeatures.Set<IHttpRequestFeature>(new RequestFeature());
+                _responseFeature = new ResponseFeature();
+                contextFeatures.Set<IHttpResponseFeature>(_responseFeature);
+                Context = application.CreateContext(contextFeatures);
                 var httpContext = Context.HttpContext;
 
-                httpContext.Features.Set<IHttpRequestFeature>(new RequestFeature());
-                _responseFeature = new ResponseFeature();
-                httpContext.Features.Set<IHttpResponseFeature>(_responseFeature);
                 var serverRequest = httpContext.Request;
                 serverRequest.Protocol = "HTTP/" + request.Version.ToString(2);
                 serverRequest.Scheme = request.RequestUri.Scheme;

diff --git a/src/Microsoft.AspNet.TestHost/WebSocketClient.cs b/src/Microsoft.AspNet.TestHost/WebSocketClient.cs
@@ -98,11 +98,13 @@ public RequestState(Uri uri, PathString pathBase, CancellationToken cancellation
                 _application = application;
 
                 // HttpContext
-                Context = _application.CreateContext(new FeatureCollection());
+                var contextFeatures = new FeatureCollection();
+                contextFeatures.Set<IHttpRequestFeature>(new RequestFeature());
+                contextFeatures.Set<IHttpResponseFeature>(new ResponseFeature());
+                Context = _application.CreateContext(contextFeatures);
                 var httpContext = Context.HttpContext;
 
                 // Request
-                httpContext.Features.Set<IHttpRequestFeature>(new RequestFeature());
                 var request = httpContext.Request;
                 request.Protocol = "HTTP/1.1";
                 var scheme = uri.Scheme;
@@ -130,7 +132,6 @@ public RequestState(Uri uri, PathString pathBase, CancellationToken cancellation
                 request.Body = Stream.Null;
 
                 // Response
-                httpContext.Features.Set<IHttpResponseFeature>(new ResponseFeature());
                 var response = httpContext.Response;
                 response.Body = Stream.Null;
                 response.StatusCode = 200;

diff --git a/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs b/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs
@@ -10,7 +10,6 @@
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Features.Internal;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.Testing.xunit;