From 70b69590a1ab48810bd23a67a4fc19bf4eece142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 30 Nov 2022 09:56:30 +0300
Subject: [PATCH] Fix AbpLazyServiceProvider.LazyGetRequiredService

It should not return null, but throw exception if a service was not found.
---
 .../Abp/DependencyInjection/AbpLazyServiceProvider.cs    | 2 +-
 .../Abp/DependencyInjection/CachedServiceProviderBase.cs | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

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 3aff8a78ad..7a18689dbe 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/AbpLazyServiceProvider.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/AbpLazyServiceProvider.cs
@@ -17,7 +17,7 @@ public class AbpLazyServiceProvider : CachedServiceProviderBase, IAbpLazyService
 
     public virtual object LazyGetRequiredService(Type serviceType)
     {
-        return GetService(serviceType);
+        return GetRequiredService(serviceType);
     }
 
     public virtual T LazyGetService<T>()
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 c261d3a3bb..2116ec8fb7 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/CachedServiceProviderBase.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/CachedServiceProviderBase.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Concurrent;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Volo.Abp.DependencyInjection;
 
@@ -22,4 +23,12 @@ public abstract class CachedServiceProviderBase
             _ => new Lazy<object>(() => ServiceProvider.GetService(serviceType))
         ).Value;
     }
+    
+    public virtual object GetRequiredService(Type serviceType)
+    {
+        return CachedServices.GetOrAdd(
+            serviceType,
+            _ => new Lazy<object>(() => ServiceProvider.GetRequiredService(serviceType))
+        ).Value;
+    }
 }