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

HttpAbstractions#265 - Remove IApplicationBuilder.Server setter.

This commit is contained in:
Chris Ross 2015-04-17 12:18:50 -07:00
parent 1a4dc9488a
commit 5fac18b418
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNet.Hosting/Builder/ApplicationBuilderFactory.cs
View File

@ -15,9 +15,9 @@ namespace Microsoft.AspNet.Hosting.Builder
_serviceProvider = serviceProvider; _serviceProvider = serviceProvider;
} }
public IApplicationBuilder CreateBuilder() public IApplicationBuilder CreateBuilder(object server)
{ {
return new ApplicationBuilder(_serviceProvider); return new ApplicationBuilder(_serviceProvider, server);
} }
} }
} }

2
src/Microsoft.AspNet.Hosting/Builder/IApplicationBuilderFactory.cs
View File

@ -7,6 +7,6 @@ namespace Microsoft.AspNet.Hosting.Builder
{ {
public interface IApplicationBuilderFactory public interface IApplicationBuilderFactory
{ {
IApplicationBuilder CreateBuilder(); IApplicationBuilder CreateBuilder(object server);
} }
} }

25
src/Microsoft.AspNet.Hosting/HostingEngine.cs
View File

@ -51,8 +51,8 @@ namespace Microsoft.AspNet.Hosting
public virtual IDisposable Start() public virtual IDisposable Start()
{ {
EnsureApplicationServices(); EnsureApplicationServices();
EnsureBuilder();
EnsureServer(); EnsureServer();
EnsureBuilder();
var applicationDelegate = BuildApplicationDelegate(); var applicationDelegate = BuildApplicationDelegate();
@ -105,17 +105,6 @@ namespace Microsoft.AspNet.Hosting
} }
} }
private void EnsureBuilder()
{
if (_builderFactory == null)
{
_builderFactory = _applicationServices.GetRequiredService<IApplicationBuilderFactory>();
}
_builder = _builderFactory.CreateBuilder();
_builder.ApplicationServices = _applicationServices;
}
private void EnsureServer() private void EnsureServer()
{ {
if (_serverFactory == null) if (_serverFactory == null)
@ -130,7 +119,17 @@ namespace Microsoft.AspNet.Hosting
} }
_serverInstance = _serverFactory.Initialize(_config); _serverInstance = _serverFactory.Initialize(_config);
_builder.Server = _serverInstance; }
private void EnsureBuilder()
{
if (_builderFactory == null)
{
_builderFactory = _applicationServices.GetRequiredService<IApplicationBuilderFactory>();
}
_builder = _builderFactory.CreateBuilder(_serverInstance);
_builder.ApplicationServices = _applicationServices;
} }
private RequestDelegate BuildApplicationDelegate() private RequestDelegate BuildApplicationDelegate()