From c3933ce8b93790dd8e6f1e47ebb9ae327d5edffb Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 8 Jul 2018 13:41:55 +0100 Subject: [PATCH] replace some string tests --- OpenSim/Services/HypergridService/GatekeeperService.cs | 6 +++--- OpenSim/Services/LLLoginService/LLLoginService.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 2dae6b74f9..1b652a02f3 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs @@ -284,7 +284,7 @@ namespace OpenSim.Services.HypergridService // // Check client // - if (m_AllowedClients != string.Empty) + if (!String.IsNullOrWhiteSpace(m_AllowedClients)) { Regex arx = new Regex(m_AllowedClients); Match am = arx.Match(curViewer); @@ -297,7 +297,7 @@ namespace OpenSim.Services.HypergridService } } - if (m_DeniedClients != string.Empty) + if (!String.IsNullOrWhiteSpace(m_DeniedClients)) { Regex drx = new Regex(m_DeniedClients); Match dm = drx.Match(curViewer); @@ -310,7 +310,7 @@ namespace OpenSim.Services.HypergridService } } - if (m_DeniedMacs != string.Empty) + if (!String.IsNullOrWhiteSpace(m_DeniedMacs)) { m_log.InfoFormat("[GATEKEEPER SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs); if (m_DeniedMacs.Contains(curMac)) diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index a57c9a7f02..d7cade5141 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs @@ -301,7 +301,7 @@ namespace OpenSim.Services.LLLoginService // // Check client // - if (m_AllowedClients != string.Empty) + if (!String.IsNullOrWhiteSpace(m_AllowedClients)) { Regex arx = new Regex(m_AllowedClients); Match am = arx.Match(clientVersion); @@ -315,7 +315,7 @@ namespace OpenSim.Services.LLLoginService } } - if (m_DeniedClients != string.Empty) + if (!String.IsNullOrWhiteSpace(m_DeniedClients)) { Regex drx = new Regex(m_DeniedClients); Match dm = drx.Match(clientVersion); @@ -329,7 +329,7 @@ namespace OpenSim.Services.LLLoginService } } - if (m_DeniedMacs != string.Empty) + if (!String.IsNullOrWhiteSpace(m_DeniedMacs)) { m_log.InfoFormat("[LLOGIN SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs); if (m_DeniedMacs.Contains(curMac))