Set IHttpContextAccessor only if DI provides it

Author: pakrym

src/Microsoft.AspNet.Http/HttpContextFactory.cs

@@ -9,6 +9,10 @@ public class HttpContextFactory : IHttpContextFactory
     {
         private IHttpContextAccessor _httpContextAccessor;
 
+        public HttpContextFactory() : this(httpContextAccessor: null)
+        {
+        }
+
         public HttpContextFactory(IHttpContextAccessor httpContextAccessor)
         {
             _httpContextAccessor = httpContextAccessor;
@@ -17,13 +21,19 @@ public HttpContextFactory(IHttpContextAccessor httpContextAccessor)
         public HttpContext Create(IFeatureCollection featureCollection)
         {
             var httpContext = new DefaultHttpContext(featureCollection);
-            _httpContextAccessor.HttpContext = httpContext;
+            if (_httpContextAccessor != null)
+            {
+                _httpContextAccessor.HttpContext = httpContext;
+            }
             return httpContext;
         }
 
         public void Dispose(HttpContext httpContext)
         {
-            _httpContextAccessor.HttpContext = null;
+            if (_httpContextAccessor != null)
+            {
+                _httpContextAccessor.HttpContext = null;
+            }
         }
     }
 }

test/Microsoft.AspNet.Http.Tests/HttpContextFactoryTests.cs

@@ -21,5 +21,16 @@ public void CreateHttpContextSetsHttpContextAccessor()
             // Assert
             Assert.True(ReferenceEquals(context, accessor.HttpContext));
         }
+
+        [Fact]
+        public void AllowsCreatingContextWithoutSettingAccessor()
+        {
+            // Arrange
+            var contextFactory = new HttpContextFactory();
+
+            // Act & Assert
+            var context = contextFactory.Create(new FeatureCollection());
+            contextFactory.Dispose(context);
+        }
     }
 }