Issue #258 - Changed the Scope.Services property to a ConcurrentDicti…

…onary to prevent the thread safety race condition from occurring
JasperFx · Feb 20, 2021 · fd9b664 · fd9b664
1 parent b9b6756
commit fd9b664
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Lamar/IoC/Instances/GeneratedInstance.cs b/src/Lamar/IoC/Instances/GeneratedInstance.cs
@@ -98,7 +98,7 @@ public Func<Scope, object> BuildFuncResolver(Scope scope)
                         }
 
                         service = resolver(s);
-                        s.Services.Add(Hash, service);
+                        s.Services.TryAdd(Hash, service);
 
                         return service;
                     }
@@ -126,7 +126,7 @@ public Func<Scope, object> BuildFuncResolver(Scope scope)
                         }
 
                         service = resolver(root);
-                        root.Services.Add(Hash, service);
+                        root.Services.TryAdd(Hash, service);
 
                         return service;
                     }

diff --git a/src/Lamar/IoC/Instances/Instance.cs b/src/Lamar/IoC/Instances/Instance.cs
@@ -234,9 +234,9 @@ protected bool tryGetService(Scope scope, out object service)
             return scope.Services.TryGetValue(Hash, out service);
         }
 
-        protected void store(Scope scope, object service)
+        protected bool store(Scope scope, object service)
         {
-            scope.Services.Add(Hash, service);
+            return scope.Services.TryAdd(Hash, service);
         }
 
         /// <summary>

diff --git a/src/Lamar/IoC/Resolvers/ScopedResolver.cs b/src/Lamar/IoC/Resolvers/ScopedResolver.cs
@@ -23,7 +23,7 @@ public object Resolve(Scope scope)
                 }
 
                 service = (T) Build(scope);
-                scope.Services.Add(Hash, service);
+                scope.Services.TryAdd(Hash, service);
 
                 if (service is IDisposable)
                 {

diff --git a/src/Lamar/IoC/Scope.cs b/src/Lamar/IoC/Scope.cs
@@ -93,7 +93,7 @@ protected void assertNotDisposed()
 
         public ConcurrentBag<IDisposable> Disposables { get; } = new ConcurrentBag<IDisposable>();
 
-        internal readonly Dictionary<int, object> Services = new Dictionary<int, object>();
+        internal readonly ConcurrentDictionary<int, object> Services = new ConcurrentDictionary<int, object>();
 
         public virtual void Dispose()
         {