Fix bug where collection was changed while enumerated

khellang · May 1, 2017 · 5fc93ce · 5fc93ce
1 parent 27e1760
commit 5fc93ce
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Scrutor/ServiceCollectionExtensions.Decoration.cs b/src/Scrutor/ServiceCollectionExtensions.Decoration.cs
@@ -141,10 +141,12 @@ IServiceCollection Decorate(IServiceCollection s, Type[] typeArguments)
                 return s.DecorateDescriptors(closedServiceType, x => x.Decorate(closedDecoratorType));
             }
 
-            return services
+            var arguments = services
                 .Where(descriptor => descriptor.ServiceType.IsAssignableTo(serviceType))
                 .Select(descriptor => descriptor.ServiceType.GenericTypeArguments)
-                .Aggregate(services, Decorate);
+                .ToArray();
+
+            return arguments.Aggregate(services, Decorate);
         }
 
         private static IServiceCollection DecorateDescriptors(this IServiceCollection services, Type serviceType, Func<ServiceDescriptor, ServiceDescriptor> decorator)