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

Fixes: U4-6597 Umbraco fails to reconnect to a SQL Server if it started up when SQL server was offline - however this requires some review.

Browse Source
This commit is contained in:
Shannon
2015-05-19 14:25:31 +10:00
parent 3b791c75f6
commit 9d8f33e98e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
View File

@@ -129,11 +129,13 @@ namespace Umbraco.Core.Cache
if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
{ {
result = new Lazy<object>(getCacheItem);
var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value)); var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration); var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
lck.UpgradeToWriteLock(); lck.UpgradeToWriteLock();
result = new Lazy<object>(getCacheItem, LazyThreadSafetyMode.PublicationOnly);
_cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback); _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
} }
} }
@@ -173,7 +175,7 @@ namespace Umbraco.Core.Cache
// NOTE - here also we must insert a Lazy<object> but we can evaluate it right now // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
// and make sure we don't store a null value. // and make sure we don't store a null value.
var result = new Lazy<object>(getCacheItem); var result = new Lazy<object>(getCacheItem, LazyThreadSafetyMode.PublicationOnly);
var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
if (value == null) return; // do not store null values (backward compat) if (value == null) return; // do not store null values (backward compat)