From 2055db30fa186f53b4e936d479c742afdf6bc2ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 26 Aug 2020 09:11:05 +0300
Subject: [PATCH] Optimize AppUrlProvider: get current tenant only if needed.

---
 .../Abp/Ui/Navigation/Urls/AppUrlProvider.cs    | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlProvider.cs b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlProvider.cs
index ffa31e66a2..912621c424 100644
--- a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlProvider.cs
+++ b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlProvider.cs
@@ -87,13 +87,16 @@ namespace Volo.Abp.UI.Navigation.Urls
                 tenantNamePlaceHolder = TenantNamePlaceHolder + '.';
             }
 
-            if (CurrentTenant.Id.HasValue)
+            if (url.Contains(tenantNamePlaceHolder))
             {
-                url = url.Replace(tenantNamePlaceHolder, await GetCurrentTenantNameAsync());
-            }
-            else
-            {
-                url = url.Replace(tenantNamePlaceHolder, "");
+                if (CurrentTenant.Id.HasValue)
+                {
+                    url = url.Replace(tenantNamePlaceHolder, await GetCurrentTenantNameAsync());
+                }
+                else
+                {
+                    url = url.Replace(tenantNamePlaceHolder, "");
+                }
             }
 
             return url;
@@ -110,4 +113,4 @@ namespace Volo.Abp.UI.Navigation.Urls
             return CurrentTenant.Name;
         }
     }
-}
\ No newline at end of file
+}