From 34be0b302f62a1d83e5ad8193af4adde8b3135dc Mon Sep 17 00:00:00 2001 From: Daniel Stolt Date: Fri, 24 Jul 2015 16:40:47 +0100 Subject: [PATCH] #5564: Fixed potential NRE when tenant RequestUrlHost is empty. Fixes #5564. --- .../Orchard.MultiTenancy/Extensions/UrlHelperExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Extensions/UrlHelperExtensions.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Extensions/UrlHelperExtensions.cs index cd59c0f24..ece3b75cc 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Extensions/UrlHelperExtensions.cs +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Extensions/UrlHelperExtensions.cs @@ -7,7 +7,7 @@ namespace Orchard.MultiTenancy.Extensions { public static class UrlHelperExtensions { public static string Tenant(this UrlHelper urlHelper, ShellSettings tenantShellSettings) { - var requestUrlHost = tenantShellSettings.RequestUrlHost.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries).First(); + var requestUrlHost = !String.IsNullOrEmpty(tenantShellSettings.RequestUrlHost) ? tenantShellSettings.RequestUrlHost.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries).First() : null; //info: (heskew) might not keep the port/vdir insertion around beyond... var port = string.Empty;