#434 Make sure IApplicationLifetime gets added even if startup throws.

aspnet · Oct 25, 2015 · 1f1c4b9 · 1f1c4b9
1 parent 0107ba0
commit 1f1c4b9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs b/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs
@@ -70,6 +70,7 @@ public HostingEngine(
             _startupLoader = startupLoader;
             _captureStartupErrors = captureStartupErrors;
             _applicationLifetime = new ApplicationLifetime();
+            _applicationServiceCollection.AddInstance<IApplicationLifetime>(_applicationLifetime);
         }
 
         public IServiceProvider ApplicationServices
@@ -144,7 +145,6 @@ private void EnsureApplicationServices()
             if (_applicationServices == null)
             {
                 EnsureStartup();
-                _applicationServiceCollection.AddInstance<IApplicationLifetime>(_applicationLifetime);
                 _applicationServices = Startup.ConfigureServicesDelegate(_applicationServiceCollection);
             }
         }

diff --git a/test/Microsoft.AspNet.Hosting.Tests/WebHostBuilderTests.cs b/test/Microsoft.AspNet.Hosting.Tests/WebHostBuilderTests.cs
@@ -11,6 +11,7 @@
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
 namespace Microsoft.AspNet.Hosting
@@ -73,6 +74,20 @@ public async Task StartupCtorThrows_Fallback()
             }
         }
 
+        [Fact]
+        public async Task IApplicationLifetimeRegisteredEvenWhenStartupCtorThrows_Fallback()
+        {
+            var builder = CreateWebHostBuilder();
+            var serverFactory = new TestServerFactory();
+            var engine = (HostingEngine)builder.UseServer(serverFactory).UseStartup<StartupCtorThrows>().Build();
+            using (engine.Start())
+            {
+                var service = engine.ApplicationServices.GetService<IApplicationLifetime>();
+                Assert.NotNull(service);
+                await AssertResponseContains(serverFactory.Application, "Exception from constructor");
+            }
+        }
+
         [Fact]
         public async Task StartupConfigureServicesThrows_Fallback()
         {