huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set IHttpContextAccessor only if DI provides it

This commit is contained in:
Pavel Krymets 2015-11-11 11:29:32 -08:00
parent 4efc40d8b1
commit 681533e06c
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Microsoft.AspNet.Http/HttpContextFactory.cs
View File

@ -9,6 +9,10 @@ namespace Microsoft.AspNet.Http.Internal
{
private IHttpContextAccessor _httpContextAccessor;
public HttpContextFactory() : this(httpContextAccessor: null)
{
}
public HttpContextFactory(IHttpContextAccessor httpContextAccessor)
{
_httpContextAccessor = httpContextAccessor;
@ -17,13 +21,19 @@ namespace Microsoft.AspNet.Http.Internal
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;
}
}
}
}

11
test/Microsoft.AspNet.Http.Tests/HttpContextFactoryTests.cs
View File

@ -21,5 +21,16 @@ namespace Microsoft.AspNet.Http.Internal
// 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);
}
}
}