Merge pull request #439 from jnm2/typed_factory_burden_on_unrelated_o…

…bject

Fixed components resolved from typed factories being disposed along with unrelated objects

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Castle Windsor Changelog
 
+## Unreleased
+
+Bugfixes:
+- Fixed components resolved from typed factories being disposed along with unrelated objects (@jnm2, #439)
+
 ## 4.1.0 (2017-09-28)
 
 Bugfixes:

src/Castle.Windsor.Tests/Facilities/TypedFactory/BurdenAddedToUnrelatedObjectTestCase.cs

@@ -0,0 +1,101 @@
+// Copyright 2018 Castle Project - http://www.castleproject.org/
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace CastleTests.Facilities.TypedFactory
+{
+	using System;
+
+	using Castle.Facilities.TypedFactory;
+	using Castle.MicroKernel.Registration;
+
+	using NUnit.Framework;
+
+	public sealed class BurdenAddedToUnrelatedObjectTestCase : AbstractContainerTestCase
+	{
+		protected override void AfterContainerCreated()
+		{
+			Container.AddFacility<TypedFactoryFacility>();
+		}
+
+		[Test]
+		public void Object_resolved_from_factory_is_not_added_as_burden_of_object_being_created()
+		{
+			Container.Register(
+				Component.For(typeof(IFactory<>)).AsFactory(),
+				Component.For<Foo>().LifeStyle.Transient,
+				Component.For<LongLivedService>().LifeStyle.Singleton,
+				Component.For<ShortLivedViewModel>().LifeStyle.Transient);
+
+			var longLivedService = Container.Resolve<LongLivedService>();
+			var shortLivedViewModel = Container.Resolve<ShortLivedViewModel>();
+
+			var prematureDisposalHandler = new EventHandler((s, e) =>
+				Assert.Fail("Long-lived service’s connection was disposed when short-lived view model was released."));
+
+			longLivedService.SqlConnection.Disposed += prematureDisposalHandler;
+			Container.Release(shortLivedViewModel);
+			longLivedService.SqlConnection.Disposed -= prematureDisposalHandler;
+
+			Container.Release(longLivedService);
+		}
+
+		public sealed class Foo : IDisposable
+		{
+			public event EventHandler Disposed;
+
+			public void Dispose() => Disposed?.Invoke(this, EventArgs.Empty);
+		}
+
+		public interface IFactory<T>
+		{
+			T Resolve();
+			void Release(T instance);
+		}
+
+		public sealed class LongLivedService
+		{
+			public IFactory<Foo> FooFactory { get; }
+
+			public Foo SqlConnection { get; private set; }
+
+			public LongLivedService(IFactory<Foo> fooFactory)
+			{
+				FooFactory = fooFactory;
+			}
+
+			public void StartSomething()
+			{
+				SqlConnection = FooFactory.Resolve();
+			}
+
+			public void Dispose()
+			{
+				FooFactory.Release(SqlConnection);
+			}
+		}
+
+		public sealed class ShortLivedViewModel
+		{
+			public IFactory<Foo> FooFactory { get; }
+			public LongLivedService LongLivedService { get; }
+
+			public ShortLivedViewModel(IFactory<Foo> fooFactory, LongLivedService longLivedService)
+			{
+				FooFactory = fooFactory;
+				LongLivedService = longLivedService;
+				longLivedService.StartSomething();
+			}
+		}
+	}
+}

src/Castle.Windsor/Facilities/TypedFactory/TypedFactoryComponentResolver.cs

@@ -70,7 +70,14 @@ public virtual object Resolve(IKernelInternal kernel, IReleasePolicy scope)
 					throw;
 				}
 			}
-			return kernel.Resolve(componentType, additionalArguments, scope);
+
+			// Ignore thread-static parent context call stack tracking. Factory-resolved components
+			// are already tracked by the factory itself and should not be added as burdens just because
+			// we happen to be resolving in the call stack of some random component’s constructor.
+
+			// Specifically, act the same as we would if the timing was slightly different and we were not
+			// resolving within the call stack of the random component’s constructor.
+			return kernel.Resolve(componentType, additionalArguments, scope, ignoreParentContext: true);
 		}
 
 		private bool LoadByName(IKernelInternal kernel)

src/Castle.Windsor/MicroKernel/DefaultKernel.cs

@@ -702,12 +702,17 @@ protected virtual void RegisterSubSystems()
 		}
 
 		protected object ResolveComponent(IHandler handler, Type service, IDictionary additionalArguments, IReleasePolicy policy)
+		{
+			return ResolveComponent(handler, service, additionalArguments, policy, ignoreParentContext: false);
+		}
+
+		private object ResolveComponent(IHandler handler, Type service, IDictionary additionalArguments, IReleasePolicy policy, bool ignoreParentContext)
 		{
 			Debug.Assert(handler != null, "handler != null");
 			var parent = currentCreationContext;
-			var context = CreateCreationContext(handler, service, additionalArguments, parent, policy);
-			currentCreationContext = context;
+			var context = CreateCreationContext(handler, service, additionalArguments, ignoreParentContext ? null : parent, policy);
 
+			currentCreationContext = context;
 			try
 			{
 				return handler.Resolve(context);

src/Castle.Windsor/MicroKernel/DefaultKernel_Resolve.cs

@@ -224,14 +224,14 @@ object IKernelInternal.Resolve(String key, Type service, IDictionary arguments,
 			return ResolveComponent(handler, service ?? typeof(object), arguments, policy);
 		}
 
-		object IKernelInternal.Resolve(Type service, IDictionary arguments, IReleasePolicy policy)
+		object IKernelInternal.Resolve(Type service, IDictionary arguments, IReleasePolicy policy, bool ignoreParentContext)
 		{
 			var handler = (this as IKernelInternal).LoadHandlerByType(null, service, arguments);
 			if(handler == null)
 			{
 				throw new ComponentNotFoundException(service);
 			}
-			return ResolveComponent(handler, service, arguments, policy);
+			return ResolveComponent(handler, service, arguments, policy, ignoreParentContext);
 		}
 
 		Array IKernelInternal.ResolveAll(Type service, IDictionary arguments, IReleasePolicy policy)

src/Castle.Windsor/MicroKernel/IKernelInternal.cs

@@ -51,7 +51,7 @@ public interface IKernelInternal : IKernel
 
 		IDisposable OptimizeDependencyResolution();
 
-		object Resolve(Type service, IDictionary arguments, IReleasePolicy policy);
+		object Resolve(Type service, IDictionary arguments, IReleasePolicy policy, bool ignoreParentContext = false);
 
 		/// <summary>
 		/// Returns a component instance by the key