claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix concurrency regression

Browse Source
This commit is contained in:
Matt Nadareski
2020-08-31 15:54:53 -07:00
parent 58039f5093
commit e98039ae38
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SabreTools.Library/DatFiles/ItemDictionary.cs
View File

@@ -1,4 +1,5 @@
using System.Collections; using System.Collections;
using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@@ -35,7 +36,7 @@ namespace SabreTools.Library.DatFiles
/// <summary> /// <summary>
/// Internal dictionary for the class /// Internal dictionary for the class
/// </summary> /// </summary>
private Dictionary<string, List<DatItem>> items; private ConcurrentDictionary<string, List<DatItem>> items;
#endregion #endregion
@@ -385,7 +386,7 @@ namespace SabreTools.Library.DatFiles
} }
// Remove the key from the dictionary // Remove the key from the dictionary
return items.Remove(key); return items.TryRemove(key, out _);
} }
/// <summary> /// <summary>
@@ -557,7 +558,7 @@ namespace SabreTools.Library.DatFiles
{ {
// If the key is missing from the dictionary, add it // If the key is missing from the dictionary, add it
if (!items.ContainsKey(key)) if (!items.ContainsKey(key))
items.Add(key, new List<DatItem>()); items.TryAdd(key, new List<DatItem>());
} }
/// <summary> /// <summary>
@@ -649,7 +650,7 @@ namespace SabreTools.Library.DatFiles
{ {
bucketedBy = Field.NULL; bucketedBy = Field.NULL;
mergedBy = DedupeType.None; mergedBy = DedupeType.None;
items = new Dictionary<string, List<DatItem>>(); items = new ConcurrentDictionary<string, List<DatItem>>();
} }
#endregion #endregion
@@ -766,11 +767,11 @@ namespace SabreTools.Library.DatFiles
// If the value is null, remove // If the value is null, remove
else if (items[key] == null) else if (items[key] == null)
items.Remove(key); items.TryRemove(key, out _);
// If there are no non-blank items, remove // If there are no non-blank items, remove
else if (items[key].Count(i => i != null && i.ItemType != ItemType.Blank) == 0) else if (items[key].Count(i => i != null && i.ItemType != ItemType.Blank) == 0)
items.Remove(key); items.TryRemove(key, out _);
} }
} }