Skip to content

Fix: Race Condition and NullReferenceException in P4Server.LastResult… #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SolarianZ wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Race Condition and NullReferenceException in P4Server.LastResult… #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions p4api.net/P4Server.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public partial class P4Server : IDisposable
{
public IKeepAlive KeepAlive { get; set; }

internal object Sync = new object();
internal readonly object Sync = new object();

private Dictionary<int, P4CommandResult> _lastResultsCache;
/// <summary>
Expand All @@ -93,20 +93,24 @@ public P4CommandResult LastResults
{
get
{
if (_lastResultsCache.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId))
lock (Sync)
{
return _lastResultsCache[System.Threading.Thread.CurrentThread.ManagedThreadId];
if (_lastResultsCache != null && _lastResultsCache.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId))
{
return _lastResultsCache[System.Threading.Thread.CurrentThread.ManagedThreadId];
}
return null;
}
return null;
}
internal set
{
if (_lastResultsCache == null)
{
_lastResultsCache = new Dictionary<int, P4CommandResult>();
}
lock (_lastResultsCache)
lock (Sync)
{
if (_lastResultsCache == null)
{
_lastResultsCache = new Dictionary<int, P4CommandResult>();
}

if (_lastResultsCache.Count > 32)
{
// if the results cache is getting large, throw away anything older than 10 seconds
Expand Down