Fixes #1108 - Stop secondary invocation of OnActivating() handlers wi…

…th decorated instance
autofac · Apr 29, 2020 · 8790ac6 · 8790ac6
2 parents 865fc7b + bf902af
commit 8790ac6
Show file tree

Hide file tree

Showing 3 changed files with 389 additions and 9 deletions.
diff --git a/src/Autofac/Core/Resolving/InstanceLookup.cs b/src/Autofac/Core/Resolving/InstanceLookup.cs
@@ -102,9 +102,6 @@ public object Execute()
                 _activationScope,
                 resolveParameters);
 
-            if (instance != decoratorTarget)
-                ComponentRegistration.RaiseActivating(this, resolveParameters, ref instance);
-
             var handler = InstanceLookupEnding;
             handler?.Invoke(this, new InstanceLookupEndingEventArgs(this, NewInstanceActivated));
 

diff --git a/test/Autofac.Specification.Test/Features/DecoratorTests.cs b/test/Autofac.Specification.Test/Features/DecoratorTests.cs
@@ -748,6 +748,92 @@ public void ResolvesDecoratedServiceWhenSingleDecoratorRegistered()
             Assert.IsType<ImplementorA>(instance.Decorated);
         }
 
+        [Fact]
+        public void ResolvesDecoratedServiceWhenTargetHasOnActivatingHandlerOnType()
+        {
+            var activatingInstances = new List<object>();
+
+            var builder = new ContainerBuilder();
+
+            builder.RegisterType<ImplementorA>().As<IDecoratedService>()
+                .OnActivating(args => activatingInstances.Add(args.Instance));
+            builder.RegisterDecorator<DecoratorA, IDecoratedService>();
+            var container = builder.Build();
+
+            var instance = container.Resolve<IDecoratedService>();
+
+            Assert.IsType<DecoratorA>(instance);
+            Assert.IsType<ImplementorA>(instance.Decorated);
+
+            Assert.Single(activatingInstances);
+            Assert.IsType<ImplementorA>(activatingInstances[0]);
+        }
+
+        [Fact]
+        public void ResolvesDecoratedServiceWhenTargetHasOnActivatingHandlerOnInterface()
+        {
+            var activatingInstances = new List<object>();
+
+            var builder = new ContainerBuilder();
+
+            builder.RegisterType<ImplementorA>().AsSelf();
+            builder.Register<IDecoratedService>(c => c.Resolve<ImplementorA>())
+                .OnActivating(args => activatingInstances.Add(args.Instance));
+            builder.RegisterDecorator<DecoratorA, IDecoratedService>();
+            var container = builder.Build();
+
+            var instance = container.Resolve<IDecoratedService>();
+
+            Assert.IsType<DecoratorA>(instance);
+            Assert.IsType<ImplementorA>(instance.Decorated);
+
+            Assert.Single(activatingInstances);
+            Assert.IsType<ImplementorA>(activatingInstances[0]);
+        }
+
+        [Fact]
+        public void ResolvesDecoratedServiceWhenTargetHasOnActivatedHandlerOnType()
+        {
+            var activatedInstances = new List<object>();
+
+            var builder = new ContainerBuilder();
+
+            builder.RegisterType<ImplementorA>().As<IDecoratedService>()
+                .OnActivated(args => activatedInstances.Add(args.Instance));
+            builder.RegisterDecorator<DecoratorA, IDecoratedService>();
+            var container = builder.Build();
+
+            var instance = container.Resolve<IDecoratedService>();
+
+            Assert.IsType<DecoratorA>(instance);
+            Assert.IsType<ImplementorA>(instance.Decorated);
+
+            Assert.Single(activatedInstances);
+            Assert.IsType<ImplementorA>(activatedInstances[0]);
+        }
+
+        [Fact]
+        public void ResolvesDecoratedServiceWhenTargetHasOnActivatedHandlerOnInterface()
+        {
+            var activatedInstances = new List<object>();
+
+            var builder = new ContainerBuilder();
+
+            builder.RegisterType<ImplementorA>().AsSelf();
+            builder.Register<IDecoratedService>(c => c.Resolve<ImplementorA>())
+                .OnActivated(args => activatedInstances.Add(args.Instance));
+            builder.RegisterDecorator<DecoratorA, IDecoratedService>();
+            var container = builder.Build();
+
+            var instance = container.Resolve<IDecoratedService>();
+
+            Assert.IsType<DecoratorA>(instance);
+            Assert.IsType<ImplementorA>(instance.Decorated);
+
+            Assert.Single(activatedInstances);
+            Assert.IsType<ImplementorA>(activatedInstances[0]);
+        }
+
         [Fact]
         public void StartableTypesCanBeDecorated()
         {