From 56c497adf56f88dc8445aea22a19ff900ecbf005 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 14 Mar 2022 20:11:54 +0000 Subject: [PATCH] ..Equals(String.Empty) is also not good --- OpenSim/Addons/OfflineIM/Service/OfflineIMServiceBase.cs | 2 +- OpenSim/Services/AssetService/AssetServiceBase.cs | 2 +- OpenSim/Services/AssetService/XAssetServiceBase.cs | 2 +- .../Services/AuthorizationService/AuthorizationServiceBase.cs | 2 +- OpenSim/Services/AvatarService/AvatarServiceBase.cs | 2 +- OpenSim/Services/FSAssetService/FSAssetService.cs | 4 ++-- OpenSim/Services/GridService/GridServiceBase.cs | 2 +- OpenSim/Services/HypergridService/UserAgentServiceBase.cs | 2 +- OpenSim/Services/PresenceService/PresenceServiceBase.cs | 2 +- OpenSim/Services/UserAccountService/GridUserServiceBase.cs | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/OpenSim/Addons/OfflineIM/Service/OfflineIMServiceBase.cs b/OpenSim/Addons/OfflineIM/Service/OfflineIMServiceBase.cs index d8e2bb846a..d68ae3d7c5 100644 --- a/OpenSim/Addons/OfflineIM/Service/OfflineIMServiceBase.cs +++ b/OpenSim/Addons/OfflineIM/Service/OfflineIMServiceBase.cs @@ -72,7 +72,7 @@ namespace OpenSim.OfflineIM // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin(dllName, new Object[] { connString, realm }); diff --git a/OpenSim/Services/AssetService/AssetServiceBase.cs b/OpenSim/Services/AssetService/AssetServiceBase.cs index ec6b786dd1..af8513d54e 100644 --- a/OpenSim/Services/AssetService/AssetServiceBase.cs +++ b/OpenSim/Services/AssetService/AssetServiceBase.cs @@ -79,7 +79,7 @@ namespace OpenSim.Services.AssetService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin(dllName); diff --git a/OpenSim/Services/AssetService/XAssetServiceBase.cs b/OpenSim/Services/AssetService/XAssetServiceBase.cs index a74b22a6a1..155ac047c5 100644 --- a/OpenSim/Services/AssetService/XAssetServiceBase.cs +++ b/OpenSim/Services/AssetService/XAssetServiceBase.cs @@ -77,7 +77,7 @@ namespace OpenSim.Services.AssetService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin(dllName); diff --git a/OpenSim/Services/AuthorizationService/AuthorizationServiceBase.cs b/OpenSim/Services/AuthorizationService/AuthorizationServiceBase.cs index 8e6d0b10b1..fd53e74f9d 100644 --- a/OpenSim/Services/AuthorizationService/AuthorizationServiceBase.cs +++ b/OpenSim/Services/AuthorizationService/AuthorizationServiceBase.cs @@ -69,7 +69,7 @@ namespace OpenSim.Services.AuthorizationService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin(dllName); diff --git a/OpenSim/Services/AvatarService/AvatarServiceBase.cs b/OpenSim/Services/AvatarService/AvatarServiceBase.cs index 740e4d13a8..d9b13062e7 100644 --- a/OpenSim/Services/AvatarService/AvatarServiceBase.cs +++ b/OpenSim/Services/AvatarService/AvatarServiceBase.cs @@ -72,7 +72,7 @@ namespace OpenSim.Services.AvatarService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin(dllName, new Object[] { connString, realm }); diff --git a/OpenSim/Services/FSAssetService/FSAssetService.cs b/OpenSim/Services/FSAssetService/FSAssetService.cs index 1999a21c98..45ff25909a 100644 --- a/OpenSim/Services/FSAssetService/FSAssetService.cs +++ b/OpenSim/Services/FSAssetService/FSAssetService.cs @@ -138,10 +138,10 @@ namespace OpenSim.Services.FSAssetService } // No databse connection found in either config - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); - if (connectionString.Equals(String.Empty)) + if (string.IsNullOrEmpty(connectionString)) throw new Exception("Missing database connection string"); // Create Storage Provider diff --git a/OpenSim/Services/GridService/GridServiceBase.cs b/OpenSim/Services/GridService/GridServiceBase.cs index 37e10d2f0e..a8aed67284 100644 --- a/OpenSim/Services/GridService/GridServiceBase.cs +++ b/OpenSim/Services/GridService/GridServiceBase.cs @@ -72,7 +72,7 @@ namespace OpenSim.Services.GridService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin(dllName, new Object[] { connString, realm }); diff --git a/OpenSim/Services/HypergridService/UserAgentServiceBase.cs b/OpenSim/Services/HypergridService/UserAgentServiceBase.cs index fae7469e43..d146b68437 100644 --- a/OpenSim/Services/HypergridService/UserAgentServiceBase.cs +++ b/OpenSim/Services/HypergridService/UserAgentServiceBase.cs @@ -72,7 +72,7 @@ namespace OpenSim.Services.HypergridService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin(dllName, new Object[] { connString, realm }); diff --git a/OpenSim/Services/PresenceService/PresenceServiceBase.cs b/OpenSim/Services/PresenceService/PresenceServiceBase.cs index f1cf783747..466e6a623e 100644 --- a/OpenSim/Services/PresenceService/PresenceServiceBase.cs +++ b/OpenSim/Services/PresenceService/PresenceServiceBase.cs @@ -72,7 +72,7 @@ namespace OpenSim.Services.PresenceService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin(dllName, new Object[] { connString, realm }); diff --git a/OpenSim/Services/UserAccountService/GridUserServiceBase.cs b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs index 0569101383..39ad219b78 100644 --- a/OpenSim/Services/UserAccountService/GridUserServiceBase.cs +++ b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs @@ -71,7 +71,7 @@ namespace OpenSim.Services.UserAccountService // // We tried, but this doesn't exist. We can't proceed. // - if (dllName.Equals(String.Empty)) + if (string.IsNullOrEmpty(dllName)) throw new Exception("No StorageProvider configured"); m_Database = LoadPlugin(dllName, new Object[] { connString, realm });