Merge branch 'master' into NetworkPR2

2 files changed, 12 insertions, 12 deletions

diff --git a/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs b/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
index 8503a358e..76b039672 100644
--- a/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
+++ b/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
@@ -139,23 +139,21 @@ namespace Emby.Server.Implementations.AppBase
         /// </summary>
         /// <typeparam name="T">Class to register.</typeparam>
         public virtual void RegisterConfiguration<T>()
+            where T : IConfigurationFactory
         {
-            if (!typeof(IConfigurationFactory).IsAssignableFrom(typeof(T)))
-            {
-                throw new ArgumentException("Parameter does not implement IConfigurationFactory");
-            }
-
-            IConfigurationFactory factory = (IConfigurationFactory)Activator.CreateInstance(typeof(T));
+            IConfigurationFactory factory = Activator.CreateInstance<T>();
 
             if (_configurationFactories == null)
             {
-                _configurationFactories = new IConfigurationFactory[] { factory };
+                _configurationFactories = new[] { factory };
             }
             else
             {
-                var list = _configurationFactories.ToList<IConfigurationFactory>();
-                list.Add(factory);
-                _configurationFactories = list.ToArray();
+                var oldLen = _configurationFactories.Length;
+                var arr = new IConfigurationFactory[oldLen + 1];
+                _configurationFactories.CopyTo(arr, 0);
+                arr[oldLen] = factory;
+                _configurationFactories = arr;
             }
 
             _configurationStores = _configurationFactories
diff --git a/Emby.Server.Implementations/AppBase/ConfigurationHelper.cs b/Emby.Server.Implementations/AppBase/ConfigurationHelper.cs
index 4c9ab33a7..77819c764 100644
--- a/Emby.Server.Implementations/AppBase/ConfigurationHelper.cs
+++ b/Emby.Server.Implementations/AppBase/ConfigurationHelper.cs
@@ -3,6 +3,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Model.Serialization;
 
 namespace Emby.Server.Implementations.AppBase
@@ -35,7 +36,7 @@ namespace Emby.Server.Implementations.AppBase
             }
             catch (Exception)
             {
-                configuration = Activator.CreateInstance(type);
+                configuration = Activator.CreateInstance(type) ?? throw new ArgumentException($"Provided path ({type}) is not valid.", nameof(type));
             }
 
             using var stream = new MemoryStream(buffer?.Length ?? 0);
@@ -48,8 +49,9 @@ namespace Emby.Server.Implementations.AppBase
             // If the file didn't exist before, or if something has changed, re-save
             if (buffer == null || !newBytes.AsSpan(0, newBytesLen).SequenceEqual(buffer))
             {
-                Directory.CreateDirectory(Path.GetDirectoryName(path));
+                var directory = Path.GetDirectoryName(path) ?? throw new ArgumentException($"Provided path ({path}) is not valid.", nameof(path));
 
+                Directory.CreateDirectory(directory);
                 // Save it after load in case we got new items
                 using (var fs = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read))
                 {