Change BeginScope to utilize the self contained current scope

castleproject#563
rvdginste · Dec 7, 2020 · d3aecbf · d3aecbf
1 parent 9d8a864
commit d3aecbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/Castle.Windsor.Extensions.DependencyInjection/Scope/ExtensionContainerScope.cs b/src/Castle.Windsor.Extensions.DependencyInjection/Scope/ExtensionContainerScope.cs
@@ -42,8 +42,10 @@ protected ExtensionContainerScope(
 		public ExtensionContainerRootScope RootScope
 			=> this as ExtensionContainerRootScope ?? rootScope;
 
-		public static ExtensionContainerScope BeginScope(ExtensionContainerScope parent, ExtensionContainerRootScope rootScope)
+		public static ExtensionContainerScope BeginScope()
 		{
+			var parent = Current;
+			var rootScope = Current?.RootScope; 
 			if (rootScope == null)
 				throw new ArgumentNullException(nameof(rootScope));
 

diff --git a/src/Castle.Windsor.Extensions.DependencyInjection/WindsorScopeFactory.cs b/src/Castle.Windsor.Extensions.DependencyInjection/WindsorScopeFactory.cs
@@ -38,10 +38,7 @@ public WindsorScopeFactory(
 		public IServiceScope CreateScope()
 		{
 			var scope =
-				ExtensionContainerScope
-					.BeginScope(
-						ExtensionContainerScope.Current,
-						rootScope);
+				ExtensionContainerScope.BeginScope();
 
 			//since WindsorServiceProvider is scoped, this gives us new instance
 			var provider = scopeFactoryContainer.Resolve<IServiceProvider>();