Improve handling of root container creation

#535
castleproject · Jul 8, 2020 · b536e58 · b536e58
1 parent 70dd700
commit b536e58
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Castle.Windsor.Extensions.DependencyInjection/WindsorServiceProviderFactory.cs b/src/Castle.Windsor.Extensions.DependencyInjection/WindsorServiceProviderFactory.cs
@@ -20,7 +20,7 @@ public sealed class WindsorServiceProviderFactory : WindsorServiceProviderFactor
 	{
 		public WindsorServiceProviderFactory() 
 		{
-			CreateContainer();
+			CreateRootContainer();
 			CreateRootScope();
 
 		}

diff --git a/src/Castle.Windsor.Extensions.DependencyInjection/WindsorServiceProviderFactoryBase.cs b/src/Castle.Windsor.Extensions.DependencyInjection/WindsorServiceProviderFactoryBase.cs
@@ -47,7 +47,7 @@ protected virtual void CreateRootScope()
 			rootScope = ExtensionContainerRootScope.BeginRootScope();
 		}
 
-		protected virtual void CreateContainer()
+		protected virtual void CreateRootContainer()
 		{
 			rootContainer = new WindsorContainer();
 			rootContainer.Kernel.AddSubSystem(
@@ -58,6 +58,12 @@ protected virtual void CreateContainer()
 
 		protected virtual IWindsorContainer BuildContainer(IServiceCollection serviceCollection, WindsorContainer windsorContainer)
 		{
+			if (rootContainer == null)
+			{
+				CreateRootContainer();
+			}
+			if (rootContainer == null) throw new ArgumentNullException("Could not initialize container");
+
 			if (serviceCollection == null)
 			{
 				return rootContainer;