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 
Conflicts:
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
	src/Umbraco.Web/Scheduling/BackgroundTaskRunnerAwaiter.cs
	src/Umbraco.Web/Umbraco.Web.csproj
This commit is contained in:
Stephan
2015-05-21 20:49:18 +02:00
parent 9b086c7fdd a76ba9a0a7
commit 115ba8dcb8
10 changed files with 519 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
View File

@@ -61,8 +61,15 @@ namespace Umbraco.Core.Cache
if (lazy.Value is ExceptionHolder) return null;
// we have a value and execution has not thrown so returning
// here does not throw
return lazy.Value;
// here does not throw - unless we're re-entering, take care of it
try
{
return lazy.Value;
}
catch (InvalidOperationException e)
{
throw new InvalidOperationException("The method that computes a value for the cache has tried to read that value from the cache.", e);
}
}
internal class ExceptionHolder