Synchronize LruKeyCache.Clear (#3361)

NethermindEth · Aug 31, 2021 · 919e4cc · 919e4cc
1 parent b525c8e
commit 919e4cc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/src/Nethermind/Nethermind.Core/Caching/LruCache.cs b/src/Nethermind/Nethermind.Core/Caching/LruCache.cs
@@ -33,13 +33,6 @@ public class LruCache<TKey, TValue> : ICache<TKey, TValue> where TKey : notnull
         private readonly Dictionary<TKey, LinkedListNode<LruCacheItem>> _cacheMap;
         private readonly LinkedList<LruCacheItem> _lruList;
 
-        [MethodImpl(MethodImplOptions.Synchronized)]
-        public void Clear()
-        {
-            _cacheMap?.Clear();
-            _lruList?.Clear();
-        }
-
         public LruCache(int maxCapacity, int startCapacity, string name)
         {
             if (maxCapacity < 1) 
@@ -58,6 +51,13 @@ public LruCache(int maxCapacity, string name)
             : this(maxCapacity, 0, name)
         {
         }
+
+        [MethodImpl(MethodImplOptions.Synchronized)]
+        public void Clear()
+        {
+            _cacheMap.Clear();
+            _lruList.Clear();
+        }
 
         [MethodImpl(MethodImplOptions.Synchronized)]
         public TValue Get(TKey key)

diff --git a/src/Nethermind/Nethermind.Core/Caching/LruKeyCache.cs b/src/Nethermind/Nethermind.Core/Caching/LruKeyCache.cs
@@ -31,12 +31,6 @@ public class LruKeyCache<TKey> where TKey : notnull
         private readonly Dictionary<TKey, LinkedListNode<TKey>> _cacheMap;
         private readonly LinkedList<TKey> _lruList;
 
-        public void Clear()
-        {
-            _cacheMap.Clear();
-            _lruList.Clear();
-        }
-
         public LruKeyCache(int maxCapacity, int startCapacity, string name)
         {
             _maxCapacity = maxCapacity;
@@ -51,6 +45,13 @@ public LruKeyCache(int maxCapacity, string name)
             : this(maxCapacity, 0, name)
         {
         }
+
+        [MethodImpl(MethodImplOptions.Synchronized)]
+        public void Clear()
+        {
+            _cacheMap.Clear();
+            _lruList.Clear();
+        }        
 
         [MethodImpl(MethodImplOptions.Synchronized)]
         public bool Get(TKey key)