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

Handle null httpContext.ApplicationServices

This commit is contained in:
Hao Kung 2014-10-14 21:02:33 -07:00
parent 6466d1061e
commit 16fee38c95
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Microsoft.AspNet.RequestContainer/RequestServicesContainer.cs
View File

@ -55,7 +55,7 @@ namespace Microsoft.AspNet.RequestContainer
private IContextAccessor<HttpContext> AppContextAccessor { get; set; }
// CONSIDER: this could be an extension method on HttpContext instead
public static RequestServicesContainer EnsureRequestServices(HttpContext httpContext)
public static RequestServicesContainer EnsureRequestServices(HttpContext httpContext, IServiceProvider services)
{
// All done if we already have a request services
if (httpContext.RequestServices != null)
@ -63,21 +63,23 @@ namespace Microsoft.AspNet.RequestContainer
return null;
}
if (httpContext.ApplicationServices == null)
var serviceProvider = httpContext.ApplicationServices ?? services;
if (serviceProvider == null)
{
throw new InvalidOperationException("TODO: httpContext.ApplicationServices is null!");
throw new InvalidOperationException("TODO: services and httpContext.ApplicationServices are both null!");
}
// Matches constructor of RequestContainer
var rootServiceProvider = httpContext.ApplicationServices.GetService<IServiceProvider>();
var rootHttpContextAccessor = httpContext.ApplicationServices.GetService<IContextAccessor<HttpContext>>();
var rootServiceScopeFactory = httpContext.ApplicationServices.GetService<IServiceScopeFactory>();
var rootServiceProvider = serviceProvider.GetService<IServiceProvider>();
var rootHttpContextAccessor = serviceProvider.GetService<IContextAccessor<HttpContext>>();
var rootServiceScopeFactory = serviceProvider.GetService<IServiceScopeFactory>();
rootHttpContextAccessor.SetContextSource(ContainerMiddleware.AccessRootHttpContext, ContainerMiddleware.ExchangeRootHttpContext);
// Pre Scope setup
var priorApplicationServices = httpContext.ApplicationServices;
var priorRequestServices = httpContext.RequestServices;
var priorApplicationServices = serviceProvider;
var priorRequestServices = serviceProvider;
var appServiceProvider = rootServiceProvider;
var appServiceScopeFactory = rootServiceScopeFactory;

13
test/Microsoft.AspNet.Hosting.Tests/UseRequestServicesFacts.cs
View File

@ -40,8 +40,10 @@ namespace Microsoft.AspNet.Hosting.Tests
Assert.True(foundRequestServicesAfter);
}
[Fact]
public void EnsureRequestServicesSetsRequestServices()
[Theory]
[InlineData(true)]
[InlineData(false)]
public void EnsureRequestServicesSetsRequestServices(bool initializeApplicationServices)
{
var baseServiceProvider = new ServiceCollection()
.Add(HostingServices.GetDefaultServices())
@ -56,7 +58,7 @@ namespace Microsoft.AspNet.Hosting.Tests
});
builder.Use(next => async c =>
{
using (var container = RequestServicesContainer.EnsureRequestServices(c))
using (var container = RequestServicesContainer.EnsureRequestServices(c, baseServiceProvider))
{
await next.Invoke(c);
}
@ -69,7 +71,10 @@ namespace Microsoft.AspNet.Hosting.Tests
});
var context = new DefaultHttpContext();
context.ApplicationServices = baseServiceProvider;
if (initializeApplicationServices)
{
context.ApplicationServices = baseServiceProvider;
}
builder.Build().Invoke(context);
Assert.False(foundRequestServicesBefore);
Assert.True(foundRequestServicesAfter);