icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-16 05:05:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Fixing unit tests

Browse Source
This commit is contained in:
Chris Cameron
2019-02-07 17:13:25 -05:00
parent 644388edad
commit 72fd823643
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ICD.Common.Utils/Collections/RateLimitedEventQueue.cs
View File

@@ -56,7 +56,16 @@ namespace ICD.Common.Utils.Collections
{ {
OnItemDequeued = null; OnItemDequeued = null;
m_DequeueTimer.Dispose(); m_QueueSection.Enter();
try
{
m_DequeueTimer.Dispose();
}
finally
{
m_QueueSection.Leave();
}
} }
/// <summary> /// <summary>

7
ICD.Common.Utils/Timers/SafeTimer.cs
View File

@@ -85,12 +85,12 @@ namespace ICD.Common.Utils.Timers
if (IsDisposed) if (IsDisposed)
return; return;
IsDisposed = true;
Stop(); Stop();
m_Timer.Dispose(); m_Timer.Dispose();
m_Callback = null; m_Callback = null;
IsDisposed = true;
} }
/// <summary> /// <summary>
@@ -160,7 +160,8 @@ namespace ICD.Common.Utils.Timers
// Essentially the meat of this class. There's some weirdness with the garbage collector where // Essentially the meat of this class. There's some weirdness with the garbage collector where
// the reference to the timer will be cleared, and eventually the CTimer will call the callback // the reference to the timer will be cleared, and eventually the CTimer will call the callback
// despite being stopped/disposed. // despite being stopped/disposed.
if (m_Timer == null if (IsDisposed ||
m_Timer == null
#if SIMPLSHARP #if SIMPLSHARP
|| m_Timer.Disposed || m_Timer.Disposed
#endif #endif