Merge pull request #1112 from alistairjevans/develop

Fix for #1111 - AutoActivation for Single Instances needs to use a Service
autofac · Apr 27, 2020 · ff483a2 · ff483a2
2 parents a6347e8 + ef8f45f
commit ff483a2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/src/Autofac/RegistrationExtensions.cs b/src/Autofac/RegistrationExtensions.cs
@@ -101,12 +101,14 @@ public static IRegistrationBuilder<T, SimpleActivatorData, SingleRegistrationSty
 
                 if (rb.RegistrationData.ActivatedHandlers.Any() || rb.RegistrationData.ActivatingHandlers.Any())
                 {
+                    var autoStartService = rb.RegistrationData.Services.First();
+
                     // https://github.com/autofac/Autofac/issues/1102
                     // Single instance registrations with activation handlers need to be auto-activated,
                     // so that other behaviour (such as OnRelease) that expects 'normal' object lifetime behaviour works as expected.
                     var activationRegistration = new RegistrationBuilder<T, SimpleActivatorData, SingleRegistrationStyle>(
                         new AutoActivateService(),
-                        new SimpleActivatorData(new DelegateActivator(typeof(T), (c, p) => c.Resolve<T>())),
+                        new SimpleActivatorData(new DelegateActivator(typeof(T), (c, p) => c.ResolveService(autoStartService))),
                         new SingleRegistrationStyle());
 
                     RegistrationBuilder.RegisterSingleComponent(cr, activationRegistration);

diff --git a/test/Autofac.Specification.Test/Lifetime/LifetimeEventTests.cs b/test/Autofac.Specification.Test/Lifetime/LifetimeEventTests.cs
@@ -173,7 +173,28 @@ public void OnReleaseForSingletonStillFiresIfNotResolved()
             Assert.True(instance.Released);
         }
 
-        private class ReleasingClass
+        [Fact]
+        public void OnReleaseForSingletonAsInterfaceStillFiresIfNotResolved()
+        {
+            var builder = new ContainerBuilder();
+
+            var instance = new ReleasingClass();
+
+            builder.RegisterInstance(instance)
+                   .As<IReleasingService>()
+                   .OnRelease(s => s.Release());
+
+            using (var container = builder.Build())
+            {
+                using (var scope = container.BeginLifetimeScope())
+                {
+                }
+            }
+
+            Assert.True(instance.Released);
+        }
+
+        private class ReleasingClass : IReleasingService
         {
             public bool Released { get; set; }
 
@@ -183,6 +204,10 @@ public void Release()
             }
         }
 
+        private interface IReleasingService
+        {
+        }
+
         private class MethodInjection
         {
             public int Param { get; private set; }