yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-v7' into 7.3.0

Browse Source
This commit is contained in:
Stephan
2015-05-26 13:19:43 +02:00
parent 3b77c301c3 7c4a189aa3
commit f285af8a4e
5 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
View File

@@ -32,11 +32,11 @@ namespace Umbraco.Web.Scheduling
// and the completed event
private readonly ManualResetEventSlim _completedEvent = new ManualResetEventSlim(false);
// fixme explain volatile here
// in various places we are testing these vars outside a lock, so make them volatile
private volatile bool _isRunning; // is running
private volatile bool _isCompleted; // does not accept tasks anymore, may still be running
private Task _runningTask;
private Task _runningTask;
private CancellationTokenSource _tokenSource;
private bool _terminating; // ensures we raise that event only once
@@ -139,9 +139,12 @@ namespace Umbraco.Web.Scheduling
{
get
{
if (_runningTask == null)
throw new InvalidOperationException("There is no current Threading.Task.");
return new ThreadingTaskImmutable(_runningTask);
lock (_locker)
{
if (_runningTask == null)
throw new InvalidOperationException("There is no current Threading.Task.");
return new ThreadingTaskImmutable(_runningTask);
}
}
}