From a7bf77b87735621e8eed3d4556986203827079f6 Mon Sep 17 00:00:00 2001
From: Kahbazi <a.kahbazi@gmail.com>
Date: Fri, 13 Dec 2019 09:48:58 +0330
Subject: [PATCH] Skip culture check when unnecessary

---
 .../src/RouteDataRequestCultureProvider.cs                 | 7 +++----
 .../Localization/src/CookieRequestCultureProvider.cs       | 3 +--
 .../Localization/src/QueryStringRequestCultureProvider.cs  | 3 +--
 .../Localization/src/RequestLocalizationMiddleware.cs      | 3 +--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Middleware/Localization.Routing/src/RouteDataRequestCultureProvider.cs b/src/Middleware/Localization.Routing/src/RouteDataRequestCultureProvider.cs
index c14db98721..415978d6fa 100644
--- a/src/Middleware/Localization.Routing/src/RouteDataRequestCultureProvider.cs
+++ b/src/Middleware/Localization.Routing/src/RouteDataRequestCultureProvider.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -59,8 +59,7 @@ namespace Microsoft.AspNetCore.Localization.Routing
                 // Value for culture but not for UI culture so default to culture value for both
                 uiCulture = culture;
             }
-
-            if (culture == null && uiCulture != null)
+            else if (culture == null && uiCulture != null)
             {
                 // Value for UI culture but not for culture so default to UI culture value for both
                 culture = uiCulture;
@@ -71,4 +70,4 @@ namespace Microsoft.AspNetCore.Localization.Routing
             return Task.FromResult(providerResultCulture);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Middleware/Localization/src/CookieRequestCultureProvider.cs b/src/Middleware/Localization/src/CookieRequestCultureProvider.cs
index 59a2891dbb..63b89fb611 100644
--- a/src/Middleware/Localization/src/CookieRequestCultureProvider.cs
+++ b/src/Middleware/Localization/src/CookieRequestCultureProvider.cs
@@ -109,8 +109,7 @@ namespace Microsoft.AspNetCore.Localization
                 // Value for culture but not for UI culture so default to culture value for both
                 uiCultureName = cultureName;
             }
-
-            if (cultureName == null && uiCultureName != null)
+            else if (cultureName == null && uiCultureName != null)
             {
                 // Value for UI culture but not for culture so default to UI culture value for both
                 cultureName = uiCultureName;
diff --git a/src/Middleware/Localization/src/QueryStringRequestCultureProvider.cs b/src/Middleware/Localization/src/QueryStringRequestCultureProvider.cs
index 1f01c0d8c5..5cef93eb7c 100644
--- a/src/Middleware/Localization/src/QueryStringRequestCultureProvider.cs
+++ b/src/Middleware/Localization/src/QueryStringRequestCultureProvider.cs
@@ -64,8 +64,7 @@ namespace Microsoft.AspNetCore.Localization
                 // Value for culture but not for UI culture so default to culture value for both
                 queryUICulture = queryCulture;
             }
-
-            if (queryCulture == null && queryUICulture != null)
+            else if (queryCulture == null && queryUICulture != null)
             {
                 // Value for UI culture but not for culture so default to UI culture value for both
                 queryCulture = queryUICulture;
diff --git a/src/Middleware/Localization/src/RequestLocalizationMiddleware.cs b/src/Middleware/Localization/src/RequestLocalizationMiddleware.cs
index 07277ecdd7..fe56abcef4 100644
--- a/src/Middleware/Localization/src/RequestLocalizationMiddleware.cs
+++ b/src/Middleware/Localization/src/RequestLocalizationMiddleware.cs
@@ -126,8 +126,7 @@ namespace Microsoft.AspNetCore.Localization
                     {
                         cultureInfo = _options.DefaultRequestCulture.Culture;
                     }
-
-                    if (cultureInfo != null && uiCultureInfo == null)
+                    else if (cultureInfo != null && uiCultureInfo == null)
                     {
                         uiCultureInfo = _options.DefaultRequestCulture.UICulture;
                     }