Change BeginScope and BeginRootScope to set current

castleproject#563
rvdginste · Dec 10, 2020 · e039c17 · e039c17
1 parent 414887d
commit e039c17
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/src/Castle.Windsor.Extensions.DependencyInjection/Scope/ExtensionContainerRootScope.cs b/src/Castle.Windsor.Extensions.DependencyInjection/Scope/ExtensionContainerRootScope.cs
@@ -16,14 +16,12 @@ namespace Castle.Windsor.Extensions.DependencyInjection.Scope
 {
 	internal class ExtensionContainerRootScope : ExtensionContainerScopeBase
 	{
-		public ExtensionContainerRootScope()
-		{
-			SetCurrentToThis();
-		}
-
+
 		public static ExtensionContainerRootScope BeginRootScope()
 		{
-			return new ExtensionContainerRootScope();
+			var scope = new ExtensionContainerRootScope();
+			Current = scope;
+			return scope;
 		}
 
 		internal override ExtensionContainerScopeBase RootScope => this;

diff --git a/src/Castle.Windsor.Extensions.DependencyInjection/Scope/ExtensionContainerScope.cs b/src/Castle.Windsor.Extensions.DependencyInjection/Scope/ExtensionContainerScope.cs
@@ -14,23 +14,25 @@
 
 namespace Castle.Windsor.Extensions.DependencyInjection.Scope
 {
+	using System.Runtime.CompilerServices;
+
 	internal class ExtensionContainerScope : ExtensionContainerScopeBase
 	{
 		private readonly ExtensionContainerScopeBase parent;
 
 		protected ExtensionContainerScope()
 		{
 			parent = Current;
-			RootScope = parent.RootScope;
-			SetCurrentToThis();
 		}
 
 		internal override ExtensionContainerScopeBase RootScope { get; set; }
 
 
 		internal static ExtensionContainerScopeBase BeginScope()
 		{
-			return new ExtensionContainerScope();
+			var scope = new ExtensionContainerScope { RootScope = Current.RootScope };
+			Current = scope;
+			return scope;
 		}
 
 		public override void Dispose()

diff --git a/src/Castle.Windsor.Extensions.DependencyInjection/Scope/ExtensionContainerScopeBase.cs b/src/Castle.Windsor.Extensions.DependencyInjection/Scope/ExtensionContainerScopeBase.cs
@@ -28,11 +28,6 @@ internal static ExtensionContainerScopeBase Current
 
 		internal virtual ExtensionContainerScopeBase RootScope { get; set; }
 
-		internal void SetCurrentToThis()
-		{
-			Current = this;
-		}
-
 		public virtual void Dispose()
 		{
 			if (scopeCache is IDisposable disposableCache)