From 2b14a6b65cc90f24d31ccbe6eab63d558750f0f1 Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Tue, 30 Oct 2018 17:20:52 -0400 Subject: [PATCH] refactor: Tidying --- ICD.Common.Utils/Services/ServiceProvider.cs | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/ICD.Common.Utils/Services/ServiceProvider.cs b/ICD.Common.Utils/Services/ServiceProvider.cs index 45c9202..6f0344e 100644 --- a/ICD.Common.Utils/Services/ServiceProvider.cs +++ b/ICD.Common.Utils/Services/ServiceProvider.cs @@ -228,18 +228,7 @@ namespace ICD.Common.Utils.Services if (tService == null) throw new ArgumentNullException("tService"); - try - { - m_ServicesSection.Enter(); - - object service; - m_Services.TryGetValue(tService, out service); - return service; - } - finally - { - m_ServicesSection.Leave(); - } + return m_ServicesSection.Execute(() => m_Services.GetDefault(tService)); } /// @@ -265,7 +254,7 @@ namespace ICD.Common.Utils.Services /// private IEnumerable GetServicesInstance() { - return m_ServicesSection.Execute(() => m_Services.Values.ToList()); + return m_ServicesSection.Execute(() => m_Services.Values.ToArray(m_Services.Count)); } ///