TypedFactory works with multi-Dispose calls and Release after Dispose

Fixes castleproject#458

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

@@ -394,6 +394,31 @@ public void Disposing_factory_does_not_destroy_singleton_components()
 			Assert.IsFalse(component.Disposed);
 		}
 
+		[Test]
+		public void Disposing_factory_twice_does_not_throw()
+		{
+			Container.Register(
+				Component.For<IDisposableFactory>().AsFactory());
+			var factory = Container.Resolve<IDisposableFactory>();
+			factory.Dispose();
+			Assert.DoesNotThrow(() => factory.Dispose());
+		}
+
+		[Test]
+		public void Release_product_after_disposing_factory_does_not_throw()
+		{
+			Container.Register(
+				Component.For<IDisposableFactory>().AsFactory(),
+				Component.For<DisposableComponent>().LifeStyle.Transient);
+			var factory = Container.Resolve<IDisposableFactory>();
+			var component = factory.Create();
+			Assert.IsFalse(component.Disposed);
+
+			factory.Dispose();
+			Assert.IsTrue(component.Disposed);
+			Assert.DoesNotThrow(() => factory.Destroy(component));
+		}
+
 		[Test]
 		public void Factory_interface_can_be_hierarchical()
 		{

src/Castle.Windsor/Facilities/TypedFactory/Internal/TypedFactoryInterceptor.cs

@@ -44,17 +44,19 @@ public TypedFactoryInterceptor(IKernelInternal kernel, ITypedFactoryComponentSel
 
 		public void Dispose()
 		{
+			if (disposed)
+			{
+				return;
+			}
+
 			disposed = true;
 			scope.Dispose();
 		}
 
 		public void Intercept(IInvocation invocation)
 		{
-			if (disposed)
-			{
-				throw new ObjectDisposedException("this", "The factory was disposed and can no longer be used.");
-			}
-
+			// don't check whether the factory was already disposed: it may be a call to Dispose or
+			// Release methods, which must remain functional after dispose as well
 			FactoryMethod method;
 			if (TryGetMethod(invocation, out method) == false)
 			{
@@ -88,6 +90,11 @@ public void SetInterceptedComponentModel(ComponentModel target)
 
 		private void Release(IInvocation invocation)
 		{
+			if (disposed)
+			{
+				return;
+			}
+
 			for (var i = 0; i < invocation.Arguments.Length; i++)
 			{
 				scope.Release(invocation.Arguments[i]);
@@ -96,6 +103,11 @@ private void Release(IInvocation invocation)
 
 		private void Resolve(IInvocation invocation)
 		{
+			if (disposed)
+			{
+				throw new ObjectDisposedException("this", "The factory was disposed and can no longer be used.");
+			}
+
 			var component = ComponentSelector.SelectComponent(invocation.Method, invocation.TargetType, invocation.Arguments);
 			if (component == null)
 			{