Resolved issue #3 - Made sure AutofacInstanceProvider disposes the li…

…fetime scope immediately when an exception is thrown in the constructor of the service being resolved.

appveyor.yml

@@ -1,11 +1,11 @@
-version: 3.0.1.{build}
+version: 3.0.2.{build}
 
 assembly_info:
   patch: true
   file: AssemblyInfo.cs
   assembly_version: "3.0.0.0"
   assembly_file_version: "{version}"
-  assembly_informational_version: "3.0.1-CI-{build}"
+  assembly_informational_version: "3.0.2-CI-{build}"
 
 configuration: Release
 

src/Autofac.Integration.Wcf/AutofacInstanceProvider.cs

@@ -93,9 +93,20 @@ public object GetInstance(InstanceContext instanceContext, Message message)
             {
                 throw new ArgumentNullException("instanceContext");
             }
-            var extension = new AutofacInstanceContext(_rootLifetimeScope);
-            instanceContext.Extensions.Add(extension);
-            return extension.Resolve(_serviceData);
+
+            var autofacInstanceContext = new AutofacInstanceContext(_rootLifetimeScope);
+            instanceContext.Extensions.Add(autofacInstanceContext);
+
+            try
+            {
+                return autofacInstanceContext.Resolve(_serviceData);
+            }
+            catch (Exception)
+            {
+                autofacInstanceContext.Dispose();
+                instanceContext.Extensions.Remove(autofacInstanceContext);
+                throw;
+            }
         }
 
         /// <summary>

tests/Autofac.Tests.Integration.Wcf/AutofacInstanceProviderFixture.cs

@@ -1,7 +1,11 @@
 using System;
+using System.Linq;
+using System.ServiceModel;
 using System.ServiceModel.Channels;
 using Autofac;
+using Autofac.Core;
 using Autofac.Integration.Wcf;
+using Autofac.Util;
 using NUnit.Framework;
 
 namespace Autofac.Tests.Integration.Wcf
@@ -43,6 +47,23 @@ public void ReleaseInstance_NullInstanceContext()
             Assert.Throws<ArgumentNullException>(() => provider.ReleaseInstance(null, instance));
         }
 
+        [Test]
+        public void LifetimeScopeDisposedWhenExceptionThrownInServiceConstructor()
+        {
+            var builder = new ContainerBuilder();
+            var released = false;
+            builder.RegisterType<Disposable>().OnRelease(d => released = true);
+            builder.RegisterType<BadService>();
+            var container = builder.Build();
+            var data = new ServiceImplementationData {ImplementationResolver = l => l.Resolve<BadService>()};
+            var provider = new AutofacInstanceProvider(container, data);
+            var context = new InstanceContext(new object());
+
+            Assert.Throws<DependencyResolutionException>(() => provider.GetInstance(context));
+
+            Assert.IsTrue(released);
+        }
+
         private class TestMessage : Message
         {
             public override MessageHeaders Headers
@@ -65,5 +86,14 @@ public override MessageVersion Version
                 get { throw new NotImplementedException(); }
             }
         }
+
+        class BadService
+        {
+            // ReSharper disable once UnusedParameter.Local
+            public BadService(Disposable disposable)
+            {
+                throw new Exception("Boom!!!");
+            }
+        }
     }
 }