From 78b8422701818a8b79999d4e5b4aa3a7edad84f3 Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Tue, 2 Apr 2019 15:05:10 +0300
Subject: [PATCH] Create NullTenantResolveResultAccessor and move
 ITenantResolveResultAccessor to Volo.Abp.MultiTenancy package

---
 .../HttpContextTenantResolveResultAccessor.cs       |  5 ++---
 .../MultiTenancy/ITenantResolveResultAccessor.cs    |  5 +++--
 .../MultiTenancy/NullTenantResolveResultAccessor.cs | 13 +++++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)
 rename framework/src/{Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore => Volo.Abp.MultiTenancy/Volo/Abp}/MultiTenancy/ITenantResolveResultAccessor.cs (58%)
 create mode 100644 framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/NullTenantResolveResultAccessor.cs

diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpContextTenantResolveResultAccessor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpContextTenantResolveResultAccessor.cs
index 4865489248..6c44195b1a 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpContextTenantResolveResultAccessor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpContextTenantResolveResultAccessor.cs
@@ -1,13 +1,12 @@
-using JetBrains.Annotations;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.AspNetCore.MultiTenancy
 {
+    [Dependency(ReplaceServices = true)]
     public class HttpContextTenantResolveResultAccessor : ITenantResolveResultAccessor, ITransientDependency
     {
-        [CanBeNull]
         public TenantResolveResult Result
         {
             get
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/ITenantResolveResultAccessor.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolveResultAccessor.cs
similarity index 58%
rename from framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/ITenantResolveResultAccessor.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolveResultAccessor.cs
index 90201dcf2d..f8acb22538 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/ITenantResolveResultAccessor.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolveResultAccessor.cs
@@ -1,9 +1,10 @@
-using Volo.Abp.MultiTenancy;
+using JetBrains.Annotations;
 
-namespace Volo.Abp.AspNetCore.MultiTenancy
+namespace Volo.Abp.MultiTenancy
 {
     public interface ITenantResolveResultAccessor
     {
+        [CanBeNull]
         TenantResolveResult Result { get; set; }
     }
 }
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/NullTenantResolveResultAccessor.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/NullTenantResolveResultAccessor.cs
new file mode 100644
index 0000000000..b97ab2c518
--- /dev/null
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/NullTenantResolveResultAccessor.cs
@@ -0,0 +1,13 @@
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.MultiTenancy
+{
+    public class NullTenantResolveResultAccessor : ITenantResolveResultAccessor, ISingletonDependency
+    {
+        public TenantResolveResult Result
+        {
+            get => null;
+            set { }
+        }
+    }
+}
\ No newline at end of file