From d03c396bc85edada3e4f7a88b15613dc8876561a Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Fri, 23 Oct 2020 14:35:37 +0800
Subject: [PATCH] Avoid Task<string> being null.

https://github.com/abpframework/abp/pull/5849/files
---
 .../MultiTenancy/CookieTenantResolveContributor.cs          | 2 +-
 .../MultiTenancy/DomainTenantResolveContributor.cs          | 2 +-
 .../MultiTenancy/HeaderTenantResolveContributor.cs          | 4 ++--
 .../MultiTenancy/QueryStringTenantResolveContributor.cs     | 6 +++---
 .../MultiTenancy/RouteTenantResolveContributor.cs           | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs
index 01d1f141b3..dd7ca5685e 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs
@@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
 
         protected override Task<string> GetTenantIdOrNameFromHttpContextOrNullAsync(ITenantResolveContext context, HttpContext httpContext)
         {
-            return Task.FromResult(httpContext.Request?.Cookies[context.GetAbpAspNetCoreMultiTenancyOptions().TenantKey]);
+            return Task.FromResult(httpContext.Request.Cookies[context.GetAbpAspNetCoreMultiTenancyOptions().TenantKey]);
         }
     }
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributor.cs
index 70da395c2e..7fa2038020 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributor.cs
@@ -30,7 +30,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
 
             context.Handled = true;
 
-            return extractResult.IsMatch ? Task.FromResult(extractResult.Matches[0].Value) : null;
+            return Task.FromResult(extractResult.IsMatch ? extractResult.Matches[0].Value : null);
         }
     }
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs
index 24faa1d709..a6a52290be 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs
@@ -18,7 +18,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
         {
             if (httpContext.Request.Headers.IsNullOrEmpty())
             {
-                return null;
+                return Task.FromResult((string)null);
             }
 
             var tenantIdKey = context.GetAbpAspNetCoreMultiTenancyOptions().TenantKey;
@@ -26,7 +26,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
             var tenantIdHeader = httpContext.Request.Headers[tenantIdKey];
             if (tenantIdHeader == string.Empty || tenantIdHeader.Count < 1)
             {
-                return null;
+                return Task.FromResult((string)null);
             }
 
             if (tenantIdHeader.Count > 1)
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributor.cs
index eb05ed7b97..7e9690077e 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributor.cs
@@ -12,9 +12,9 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
 
         protected override Task<string> GetTenantIdOrNameFromHttpContextOrNullAsync(ITenantResolveContext context, HttpContext httpContext)
         {
-            return httpContext.Request.QueryString.HasValue
-                ? Task.FromResult(httpContext.Request.Query[context.GetAbpAspNetCoreMultiTenancyOptions().TenantKey].ToString())
-                : null;
+            return Task.FromResult(httpContext.Request.QueryString.HasValue
+                ? httpContext.Request.Query[context.GetAbpAspNetCoreMultiTenancyOptions().TenantKey].ToString()
+                : null);
         }
     }
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs
index d1c59523de..7ac3943c84 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs
@@ -15,7 +15,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
         protected override Task<string> GetTenantIdOrNameFromHttpContextOrNullAsync(ITenantResolveContext context, HttpContext httpContext)
         {
             var tenantId = httpContext.GetRouteValue(context.GetAbpAspNetCoreMultiTenancyOptions().TenantKey);
-            return tenantId != null ? Task.FromResult(Convert.ToString(tenantId)) : null;
+            return Task.FromResult(tenantId != null ? Convert.ToString(tenantId) : null);
         }
     }
 }