Ensure ConfigureServices is only called once

aspnet · May 11, 2015 · 1354d66 · 1354d66
1 parent 12d3f48
commit 1354d66
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 5 deletions.
diff --git a/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs b/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs
@@ -91,11 +91,12 @@ public virtual IDisposable Start()
 
         private void EnsureApplicationServices()
         {
-            EnsureStartup();
-
-            _applicationServiceCollection.AddInstance<IApplicationLifetime>(_applicationLifetime);
-
-            _applicationServices = Startup.ConfigureServicesDelegate(_applicationServiceCollection);
+            if (_applicationServices == null)
+            {
+                EnsureStartup();
+                _applicationServiceCollection.AddInstance<IApplicationLifetime>(_applicationLifetime);
+                _applicationServices = Startup.ConfigureServicesDelegate(_applicationServiceCollection);
+            }
         }
 
         private void EnsureStartup()

diff --git a/test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs b/test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs
@@ -291,6 +291,38 @@ public void HostingEngine_DoesNot_CreateDefaultRequestIdentifierFeature_IfPresen
             Assert.Same(requestIdentifierFeature, httpContext.GetFeature<IRequestIdentifierFeature>());
         }
 
+        [Fact]
+        public void HostingEngine_InvokesConfigureMethodsOnlyOnce()
+        {
+            var engine = CreateBuilder()
+                .UseServer(this)
+                .UseStartup<CountStartup>()
+                .Build();
+            using (engine.Start())
+            {
+                var services = engine.ApplicationServices;
+                var services2 = engine.ApplicationServices;
+                Assert.Equal(1, CountStartup.ConfigureCount);
+                Assert.Equal(1, CountStartup.ConfigureServicesCount);
+            }
+        }
+
+        public class CountStartup
+        {
+            public static int ConfigureServicesCount;
+            public static int ConfigureCount;
+
+            public void ConfigureServices(IServiceCollection services)
+            {
+                ConfigureServicesCount++;
+            }
+
+            public void Configure(IApplicationBuilder app)
+            {
+                ConfigureCount++;
+            }
+        }
+
         private IHostingEngine CreateHostingEngine(RequestDelegate requestDelegate)
         {
             var applicationBuilder = new Mock<IApplicationBuilder>();