Making the cache dictionary thread safe

Fixes moq#149
Keboo · Oct 3, 2022 · bbd7d79 · bbd7d79
1 parent 33fbf25
commit bbd7d79
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/Moq.AutoMock/AutoMocker.cs b/Moq.AutoMock/AutoMocker.cs
@@ -123,7 +123,7 @@ public AutoMocker(MockBehavior mockBehavior, DefaultValue defaultValue, DefaultV
             };
         }) ?? new Dictionary<Type, object?>();
 
-    private Dictionary<Type, IInstance>? TypeMap
+    private NonBlocking.ConcurrentDictionary<Type, IInstance>? TypeMap
         => Resolvers.OfType<CacheResolver>().FirstOrDefault()?.TypeMap;
 
     private bool TryResolve(Type serviceType,
@@ -1054,7 +1054,7 @@ internal void CacheInstances(IEnumerable<(Type, IInstance)> instances)
         });
     }
 
-    private void WithTypeMap(Action<Dictionary<Type, IInstance>> onTypeMap)
+    private void WithTypeMap(Action<NonBlocking.ConcurrentDictionary<Type, IInstance>> onTypeMap)
     {
         if (TypeMap is { } typeMap)
         {

diff --git a/Moq.AutoMock/Moq.AutoMock.csproj b/Moq.AutoMock/Moq.AutoMock.csproj
@@ -33,6 +33,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="NonBlocking" Version="2.1.0" />
     <ProjectReference Include="../Generators/Generators.csproj">
       <OutputItemType>Analyzer</OutputItemType>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

diff --git a/Moq.AutoMock/Resolvers/CacheResolver.cs b/Moq.AutoMock/Resolvers/CacheResolver.cs
@@ -1,18 +1,18 @@
-namespace Moq.AutoMock.Resolvers;
-
-/// <summary>
-/// Provides the cache used by AutoMocker.
-/// </summary>
-public class CacheResolver : IMockResolver
-{
-    internal Dictionary<Type, IInstance> TypeMap { get; } = new();
-
-    /// <inheritdoc />
-    public void Resolve(MockResolutionContext context)
-    {
-        if (TypeMap.TryGetValue(context.RequestType, out IInstance instance))
-        {
-            context.Value = instance;
-        }
-    }
-}
+namespace Moq.AutoMock.Resolvers;
+
+/// <summary>
+/// Provides the cache used by AutoMocker.
+/// </summary>
+public class CacheResolver : IMockResolver
+{
+    internal NonBlocking.ConcurrentDictionary<Type, IInstance> TypeMap { get; } = new();
+
+    /// <inheritdoc />
+    public void Resolve(MockResolutionContext context)
+    {
+        if (TypeMap.TryGetValue(context.RequestType, out IInstance instance))
+        {
+            context.Value = instance;
+        }
+    }
+}