Add check that the disposing scope is current, before changing the pa…

…rent. castleproject#563
rvdginste · Dec 10, 2020 · 36ac910 · 36ac910
1 parent ecfa403
commit 36ac910
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Castle.Windsor.Extensions.DependencyInjection/Scope/ExtensionContainerScope.cs b/src/Castle.Windsor.Extensions.DependencyInjection/Scope/ExtensionContainerScope.cs
@@ -51,12 +51,15 @@ internal static ExtensionContainerScope BeginScope()
 
 		public void Dispose()
 		{
+			if (current.Value == this)
+			{
+				current.Value = parent;
+			}
+
 			if (scopeCache is IDisposable disposableCache)
 			{
 				disposableCache.Dispose();
 			}
-
-			current.Value = parent;
 		}
 
 		public Burden GetCachedInstance(ComponentModel model, ScopedInstanceActivationCallback createInstance)