Merge pull request #20 from killswtch/ThreadSafety

Thread safety

Author: Casey-Bateman

Hudl.Ffmpeg/Properties/AssemblyInfo.cs

@@ -35,6 +35,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyInformationalVersion("2.1.3.0")]
-[assembly: AssemblyFileVersion("2.1.3.0")]
+[assembly: AssemblyInformationalVersion("2.1.4.0")]
+[assembly: AssemblyFileVersion("2.1.4.0")]
 [assembly: AssemblyVersion("1.0.0.0")]

Hudl.Ffmpeg/Resources/Resource.cs

@@ -11,6 +11,7 @@ namespace Hudl.FFmpeg.Resources
     /// </summary>
     public class Resource
     {
+		private static readonly object AllTypesLock = new object();
         private static readonly List<Type> AllTypes = new List<Type>();
 
         /// <summary>
@@ -78,18 +79,21 @@ public static IContainer From(string fullPath)
         private static IContainer From(string filePath, string fileName)
         {
             var fileExtension = Helpers.GetExtensionFromFullName(fileName);
-            if (AllTypes.Count == 0)
-            {
-                AllTypes.AddRange(GetTypes<IContainer>());
-            }
+			lock (AllTypesLock)
+			{
+				if (AllTypes.Count == 0)
+				{
+					AllTypes.AddRange(GetTypes<IContainer>());
+				}
+			}
 
-            var correcTContainer = AllTypes.FirstOrDefault(t => t.Name.ToUpper() == fileExtension.ToUpper());
-            if (correcTContainer == null)
+            var correctContainer = AllTypes.FirstOrDefault(t => t.Name.ToUpper() == fileExtension.ToUpper());
+            if (correctContainer == null)
             {
                 throw new InvalidOperationException("Cannot derive resource type from path provided.");
             }
 
-            var newInstance = (IContainer)Activator.CreateInstance(correcTContainer);
+            var newInstance = (IContainer)Activator.CreateInstance(correctContainer);
             newInstance.Path = filePath;
             newInstance.Name = fileName;
             return newInstance;