- fixed IOC-320 - System.ArgumentNullException at Castle.MicroKernel.…

…Burden.Release(IReleasePolicy policy)
castleproject · Nov 19, 2011 · 60367ab · 60367ab
1 parent b86d0da
commit 60367ab
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/Changes.txt b/Changes.txt
@@ -4,6 +4,7 @@
 - implemented IOC-313 - Add event to be raised by the container whenever empty collection is being resolved
 - implemented IOC-312 - Add shortcut methods to API to register types from given namespace
 
+- fixed IOC-320 - System.ArgumentNullException at Castle.MicroKernel.Burden.Release(IReleasePolicy policy)
 - fixed IOC-315 - ResolveAll should not ignore generic constraint violations on dependencies of resolved component
 - fixed IOC-314 - Parsing container configuration uses the current culture
 - fixed IOC-311 - OptimizeDependencyResolutionDisposable eats exceptions thrown during installation

diff --git a/src/Castle.Windsor.Tests/Lifecycle/DecomissioningResponsibilitiesTestCase.cs b/src/Castle.Windsor.Tests/Lifecycle/DecomissioningResponsibilitiesTestCase.cs
@@ -18,7 +18,6 @@ namespace CastleTests.Lifecycle
 
 	using Castle.MicroKernel.Registration;
 	using Castle.MicroKernel.Tests.ClassComponents;
-	using Castle.MicroKernel.Tests.Lifestyle;
 	using Castle.MicroKernel.Tests.Pools;
 
 	using CastleTests.Components;
@@ -122,10 +121,6 @@ public class DisposableTemplateEngine : DisposableBase
 		{
 		}
 
-		public class EmptyClass
-		{
-		}
-
 		[Test]
 		public void ComponentsAreOnlyDisposedOnce()
 		{
@@ -259,5 +254,22 @@ public void WhenRootComponentIsNotDisposableButThirdLevelDependenciesAre_Depende
 			Assert.IsTrue(instance1.FakeRoot.A.IsDisposed);
 			Assert.IsTrue(instance1.FakeRoot.B.IsDisposed);
 		}
+
+		[Test]
+		[Bug("IOC-320")]
+		public void Expected_exception_during_creation_doesnt_prevent_from_being_released_properly()
+		{
+			Container.Register(Component.For<GenA<int>>().LifestyleTransient(),
+			                   Component.For<B>().UsingFactoryMethod<B>(delegate
+			                   {
+			                   	throw new NotImplementedException("boo hoo!");
+			                   }).LifestyleTransient()
+			                   	.OnDestroy(Assert.IsNotNull));
+
+			var a = Container.Resolve<GenA<int>>();
+
+			Container.Release(a);
+		}
+
 	}
 }
diff --git a/src/Castle.Windsor/MicroKernel/Context/CreationContext.cs b/src/Castle.Windsor/MicroKernel/Context/CreationContext.cs
@@ -384,6 +384,10 @@ private void ExitResolutionContext(Burden burden, bool trackContext)
 			{
 				return;
 			}
+			if (burden.Instance == null)
+			{
+				return;
+			}
 			if (burden.RequiresPolicyRelease == false)
 			{
 				return;