github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace ConcurrentBag<T> with HashSet<T>

Browse Source 
Fixes #487
This commit is contained in:
FiniteReality
2017-01-17 20:08:18 +00:00
parent 236304c1a4
commit a65ba095af
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Discord.Net.Commands/CommandService.cs
View File

@@ -18,7 +18,7 @@ namespace Discord.Commands
private readonly ConcurrentDictionary<Type, ConcurrentDictionary<Type, TypeReader>> _typeReaders; private readonly ConcurrentDictionary<Type, ConcurrentDictionary<Type, TypeReader>> _typeReaders;
private readonly ConcurrentDictionary<Type, TypeReader> _defaultTypeReaders; private readonly ConcurrentDictionary<Type, TypeReader> _defaultTypeReaders;
private readonly ImmutableList<Tuple<Type, Type>> _entityTypeReaders; //TODO: Candidate for C#7 Tuple private readonly ImmutableList<Tuple<Type, Type>> _entityTypeReaders; //TODO: Candidate for C#7 Tuple
private readonly ConcurrentBag<ModuleInfo> _moduleDefs; private readonly HashSet<ModuleInfo> _moduleDefs;
private readonly CommandMap _map; private readonly CommandMap _map;
internal readonly bool _caseSensitive; internal readonly bool _caseSensitive;
@@ -160,8 +160,7 @@ namespace Discord.Commands
} }
private bool RemoveModuleInternal(ModuleInfo module) private bool RemoveModuleInternal(ModuleInfo module)
{ {
var defsRemove = module; if (!_moduleDefs.Remove(module))
if (!_moduleDefs.TryTake(out defsRemove))
return false; return false;
foreach (var cmd in module.Commands) foreach (var cmd in module.Commands)