Merge branch 'refs/heads/pr/53' into develop

Author: JimBobSquarePants

src/UmbracoFileSystemProviders.Azure/AzureBlobFileSystem.cs

@@ -63,7 +63,20 @@ public AzureBlobFileSystem(string containerName, string rootUrl, string connecti
         /// <param name="useDefaultRoute">Whether to use the default "media" route in the url independent of the blob container.</param>
         public AzureBlobFileSystem(string containerName, string rootUrl, string connectionString, string maxDays, string useDefaultRoute)
         {
-            this.FileSystem = AzureFileSystem.GetInstance(containerName, rootUrl, connectionString, maxDays, useDefaultRoute);
+            bool useDefaultRouteParsed;
+            int maxDaysParsed;
+
+            if (int.TryParse(maxDays, out maxDaysParsed) == false)
+            {
+                throw new ArgumentException(string.Format("Argument maxDays with value {0} could be converted from string to int", maxDays));
+            }
+
+            if (bool.TryParse(useDefaultRoute, out useDefaultRouteParsed) == false)
+            {
+                throw new ArgumentException(string.Format("Argument useDefaultRoute with value {0} could be converted from string to bool", useDefaultRoute));
+            }
+
+            this.FileSystem = new AzureFileSystem(containerName, rootUrl, connectionString, maxDaysParsed, useDefaultRouteParsed);
         }
 
         /// <summary>

src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs

@@ -41,9 +41,9 @@ internal class AzureFileSystem : IFileSystem
         private static readonly object Locker = new object();
 
         /// <summary>
-        /// The singleton instance of <see cref="AzureFileSystem"/>.
+        /// A list of <see cref="AzureFileSystem"/>.
         /// </summary>
-        private static AzureFileSystem fileSystem;
+        private static List<AzureFileSystem> fileSystems;
 
         /// <summary>
         /// The root url.
@@ -66,7 +66,7 @@ internal class AzureFileSystem : IFileSystem
         /// <exception cref="ArgumentNullException">
         /// Thrown if <paramref name="containerName"/> is null or whitespace.
         /// </exception>
-        private AzureFileSystem(string containerName, string rootUrl, string connectionString, int maxDays, bool useDefaultRoute)
+        internal AzureFileSystem(string containerName, string rootUrl, string connectionString, int maxDays, bool useDefaultRoute)
         {
             if (string.IsNullOrWhiteSpace(containerName))
             {
@@ -149,11 +149,11 @@ private AzureFileSystem(string containerName, string rootUrl, string connectionS
         /// <param name="maxDays">The maximum number of days to cache blob items for in the browser.</param>
         /// <param name="useDefaultRoute">Whether to use the default "media" route in the url independent of the blob container.</param>
         /// <returns>The <see cref="AzureFileSystem"/></returns>
-        public static AzureFileSystem GetInstance(string containerName, string rootUrl, string connectionString, string maxDays, string useDefaultRoute)
+        public AzureFileSystem GetInstance(string containerName, string rootUrl, string connectionString, string maxDays, string useDefaultRoute)
         {
             lock (Locker)
             {
-                if (fileSystem == null)
+                if (fileSystems.SingleOrDefault(fs => fs.ContainerName == containerName && fs.rootUrl == rootUrl) == null)
                 {
                     int max;
                     if (!int.TryParse(maxDays, out max))
@@ -167,10 +167,19 @@ public static AzureFileSystem GetInstance(string containerName, string rootUrl,
                         defaultRoute = true;
                     }
 
-                    fileSystem = new AzureFileSystem(containerName, rootUrl, connectionString, max, defaultRoute);
+                    var fileSystem = new AzureFileSystem(containerName, rootUrl, connectionString, max, defaultRoute);
+
+                    if (fileSystems == null)
+                    {
+                        fileSystems = new List<AzureFileSystem> { fileSystem };
+                    }
+                    else
+                    {
+                        fileSystems.Add(fileSystem);
+                    }
                 }
 
-                return fileSystem;
+                return fileSystems.SingleOrDefault(fs => fs.ContainerName == containerName && fs.rootUrl == rootUrl);
             }
         }