From 5ccdbcc854772befe3096941268a198cac43c397 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Tue, 13 Aug 2019 19:39:04 +0800
Subject: [PATCH] Resolve #1618 Use a constant string as the key for the
 HttpContext's Items.

---
 .../HttpContextTenantResolveResultAccessor.cs      | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

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 6c44195b1a..593d9a7024 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
@@ -7,17 +7,11 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
     [Dependency(ReplaceServices = true)]
     public class HttpContextTenantResolveResultAccessor : ITenantResolveResultAccessor, ITransientDependency
     {
+        public const string HttpContextItemName = "__AbpTenantResolveResult";
+
         public TenantResolveResult Result
         {
-            get
-            {
-                if (_httpContextAccessor.HttpContext == null)
-                {
-                    return null;
-                }
-
-                return _httpContextAccessor.HttpContext.Items[""] as TenantResolveResult;
-            }
+            get => _httpContextAccessor.HttpContext?.Items[HttpContextItemName] as TenantResolveResult;
             set
             {
                 if (_httpContextAccessor.HttpContext == null)
@@ -25,7 +19,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
                     return;
                 }
 
-                _httpContextAccessor.HttpContext.Items[""] = value;
+                _httpContextAccessor.HttpContext.Items[HttpContextItemName] = value;
             }
         }