From ab6f4ceaaeb63e8f88b30437a31a3da43b2709ea Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 15 Aug 2022 11:11:51 +0800
Subject: [PATCH 1/2] Fix concurrency problem of `IAbpLazyServiceProvider`.

Resolve #9404
---
 .../AbpLazyServiceProvider.cs                 | 21 ++++----
 .../CachedServiceProviderBase.cs              | 16 +++---
 .../AbpLazyServiceProvider_Tests.cs           | 50 +++++++++++++++++++
 3 files changed, 67 insertions(+), 20 deletions(-)
 create mode 100644 framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/AbpLazyServiceProvider_Tests.cs

diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/AbpLazyServiceProvider.cs b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/AbpLazyServiceProvider.cs
index 363c3b3885..3aff8a78ad 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/AbpLazyServiceProvider.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/AbpLazyServiceProvider.cs
@@ -1,19 +1,13 @@
 using System;
-using System.Collections.Generic;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Volo.Abp.DependencyInjection;
 
-public class AbpLazyServiceProvider : IAbpLazyServiceProvider, ITransientDependency
+[ExposeServices(typeof(IAbpLazyServiceProvider))]
+public class AbpLazyServiceProvider : CachedServiceProviderBase, IAbpLazyServiceProvider, ITransientDependency
 {
-    protected IDictionary<Type, object> CachedServices { get; set; }
-
-    protected IServiceProvider ServiceProvider { get; set; }
-
     public AbpLazyServiceProvider(IServiceProvider serviceProvider)
+        : base(serviceProvider)
     {
-        ServiceProvider = serviceProvider;
-        CachedServices = new Dictionary<Type, object>();
     }
 
     public virtual T LazyGetRequiredService<T>()
@@ -23,7 +17,7 @@ public class AbpLazyServiceProvider : IAbpLazyServiceProvider, ITransientDepende
 
     public virtual object LazyGetRequiredService(Type serviceType)
     {
-        return CachedServices.GetOrAdd(serviceType, () => ServiceProvider.GetRequiredService(serviceType));
+        return GetService(serviceType);
     }
 
     public virtual T LazyGetService<T>()
@@ -33,7 +27,7 @@ public class AbpLazyServiceProvider : IAbpLazyServiceProvider, ITransientDepende
 
     public virtual object LazyGetService(Type serviceType)
     {
-        return CachedServices.GetOrAdd(serviceType, () => ServiceProvider.GetService(serviceType));
+        return GetService(serviceType);
     }
 
     public virtual T LazyGetService<T>(T defaultValue)
@@ -53,6 +47,9 @@ public class AbpLazyServiceProvider : IAbpLazyServiceProvider, ITransientDepende
 
     public virtual object LazyGetService(Type serviceType, Func<IServiceProvider, object> factory)
     {
-        return CachedServices.GetOrAdd(serviceType, () => factory(ServiceProvider));
+        return CachedServices.GetOrAdd(
+            serviceType,
+            _ => new Lazy<object>(() => factory(ServiceProvider))
+        ).Value;
     }
 }
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/CachedServiceProviderBase.cs b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/CachedServiceProviderBase.cs
index d543493ce9..c261d3a3bb 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/CachedServiceProviderBase.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/CachedServiceProviderBase.cs
@@ -5,21 +5,21 @@ namespace Volo.Abp.DependencyInjection;
 
 public abstract class CachedServiceProviderBase
 {
-    private readonly IServiceProvider _serviceProvider;
-    private readonly ConcurrentDictionary<Type, Lazy<object>> _cachedServices;
+    protected IServiceProvider ServiceProvider { get; }
+    protected ConcurrentDictionary<Type, Lazy<object>> CachedServices { get; }
 
     protected CachedServiceProviderBase(IServiceProvider serviceProvider)
     {
-        _serviceProvider = serviceProvider;
-        _cachedServices = new ConcurrentDictionary<Type, Lazy<object>>();
-        _cachedServices.TryAdd(typeof(IServiceProvider), new Lazy<object>(() => _serviceProvider));
+        ServiceProvider = serviceProvider;
+        CachedServices = new ConcurrentDictionary<Type, Lazy<object>>();
+        CachedServices.TryAdd(typeof(IServiceProvider), new Lazy<object>(() => ServiceProvider));
     }
 
     public virtual object GetService(Type serviceType)
     {
-        return _cachedServices.GetOrAdd(
+        return CachedServices.GetOrAdd(
             serviceType,
-            _ => new Lazy<object>(() => _serviceProvider.GetService(serviceType))
+            _ => new Lazy<object>(() => ServiceProvider.GetService(serviceType))
         ).Value;
     }
-}
\ No newline at end of file
+}
diff --git a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/AbpLazyServiceProvider_Tests.cs b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/AbpLazyServiceProvider_Tests.cs
new file mode 100644
index 0000000000..2d99e989b0
--- /dev/null
+++ b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/AbpLazyServiceProvider_Tests.cs
@@ -0,0 +1,50 @@
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using Volo.Abp.Modularity;
+using Volo.Abp.Testing.Utils;
+using Xunit;
+
+namespace Volo.Abp.DependencyInjection;
+
+public class AbpLazyServiceProvider_Tests
+{
+    [Fact]
+    public void CachedServiceProvider_Should_Cache_Services()
+    {
+        using (var application = AbpApplicationFactory.Create<TestModule>())
+        {
+            application.Initialize();
+
+            var lazyServiceProvider = application.ServiceProvider.GetRequiredService<IAbpLazyServiceProvider>();
+
+            var transientTestService1 = lazyServiceProvider.LazyGetRequiredService<TransientTestService>();
+            var transientTestService2 = lazyServiceProvider.LazyGetRequiredService<TransientTestService>();
+            transientTestService1.ShouldBeSameAs(transientTestService2);
+
+            var testCounter = application.ServiceProvider.GetRequiredService<ITestCounter>();
+            testCounter.GetValue(nameof(TransientTestService)).ShouldBe(1);
+        }
+    }
+
+    [DependsOn(typeof(AbpTestBaseModule))]
+    private class TestModule : AbpModule
+    {
+        public TestModule()
+        {
+            SkipAutoServiceRegistration = true;
+        }
+
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            context.Services.AddType<TransientTestService>();
+        }
+    }
+
+    private class TransientTestService : ITransientDependency
+    {
+        public TransientTestService(ITestCounter counter)
+        {
+            counter.Increment(nameof(TransientTestService));
+        }
+    }
+}

From 69ac9c00421e5238fdd1c40e8370920dd1d95d46 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 15 Aug 2022 11:15:24 +0800
Subject: [PATCH 2/2] Update AbpLazyServiceProvider_Tests.cs

---
 .../Abp/DependencyInjection/AbpLazyServiceProvider_Tests.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/AbpLazyServiceProvider_Tests.cs b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/AbpLazyServiceProvider_Tests.cs
index 2d99e989b0..c78dc9c989 100644
--- a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/AbpLazyServiceProvider_Tests.cs
+++ b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/AbpLazyServiceProvider_Tests.cs
@@ -9,7 +9,7 @@ namespace Volo.Abp.DependencyInjection;
 public class AbpLazyServiceProvider_Tests
 {
     [Fact]
-    public void CachedServiceProvider_Should_Cache_Services()
+    public void LazyServiceProvider_Should_Cache_Services()
     {
         using (var application = AbpApplicationFactory.Create<TestModule>())
         {