Fixes error in cache patch
This commit is contained in:
hartvig
@@ -790,7 +790,7 @@ namespace umbraco.cms.businesslogic
|
||||
public PropertyType getPropertyType(string alias)
|
||||
{
|
||||
// NH 22-08-08, Get from the property type stack to ensure support of master document types
|
||||
object o = this.PropertyTypes.Find(delegate(PropertyType pt) { return pt.Alias == alias; });
|
||||
object o = this.PropertyTypes.Find(pt => pt.Alias == alias);
|
||||
|
||||
//object o = SqlHelper.ExecuteScalar<object>(
|
||||
// "Select id from cmsPropertyType where contentTypeId=@contentTypeId And Alias=@alias",
|
||||
|
||||
237
umbraco/cms/businesslogic/cache/Cache.cs
vendored
237
umbraco/cms/businesslogic/cache/Cache.cs
vendored
@@ -4,75 +4,82 @@ using System.Web;
|
||||
|
||||
namespace umbraco.cms.businesslogic.cache
|
||||
{
|
||||
/// <summary>
|
||||
/// Used to easily store and retreive items from the cache.
|
||||
/// </summary>
|
||||
public class Cache
|
||||
{
|
||||
/// <summary>
|
||||
/// Used to easily store and retreive items from the cache.
|
||||
/// </summary>
|
||||
public class Cache
|
||||
{
|
||||
private static readonly object m_Locker = new object();
|
||||
|
||||
/// <summary>
|
||||
/// Clears everything in umbraco's runtime cache, which means that not only
|
||||
/// umbraco content is removed, but also other cache items from pages running in
|
||||
/// the same application / website. Use with care :-)
|
||||
/// </summary>
|
||||
public static void ClearAllCache()
|
||||
{
|
||||
System.Web.Caching.Cache c = System.Web.HttpRuntime.Cache;
|
||||
if (c != null)
|
||||
{
|
||||
System.Collections.IDictionaryEnumerator cacheEnumerator = c.GetEnumerator();
|
||||
while ( cacheEnumerator.MoveNext() )
|
||||
{
|
||||
c.Remove(cacheEnumerator.Key.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Clears the item in umbraco's runtime cache with the given key
|
||||
/// </summary>
|
||||
/// <param name="key">Key</param>
|
||||
public static void ClearCacheItem(string key)
|
||||
{
|
||||
/// <summary>
|
||||
/// Clears everything in umbraco's runtime cache, which means that not only
|
||||
/// umbraco content is removed, but also other cache items from pages running in
|
||||
/// the same application / website. Use with care :-)
|
||||
/// </summary>
|
||||
public static void ClearAllCache()
|
||||
{
|
||||
System.Web.Caching.Cache c = System.Web.HttpRuntime.Cache;
|
||||
if (c != null)
|
||||
{
|
||||
System.Collections.IDictionaryEnumerator cacheEnumerator = c.GetEnumerator();
|
||||
while (cacheEnumerator.MoveNext())
|
||||
{
|
||||
c.Remove(cacheEnumerator.Key.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Clears the item in umbraco's runtime cache with the given key
|
||||
/// </summary>
|
||||
/// <param name="key">Key</param>
|
||||
public static void ClearCacheItem(string key)
|
||||
{
|
||||
// NH 10 jan 2012
|
||||
// Patch by the always wonderful Stéphane Gay to avoid cache null refs
|
||||
var cache = HttpRuntime.Cache;
|
||||
if (cache[key] != null)
|
||||
lock (m_Locker)
|
||||
{
|
||||
var context = HttpContext.Current;
|
||||
if (context != null)
|
||||
context.Trace.Warn("Cache", "Item " + key + " removed from cache");
|
||||
var cache = HttpRuntime.Cache;
|
||||
if (cache[key] != null)
|
||||
{
|
||||
cache.Remove(key);
|
||||
var context = HttpContext.Current;
|
||||
if (context != null)
|
||||
{
|
||||
context.Trace.Warn("Cache", "Item " + key + " removed from cache");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Clears all objects in the System.Web.Cache with the System.Type name as the
|
||||
/// input parameter. (using [object].GetType())
|
||||
/// </summary>
|
||||
/// <param name="TypeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
|
||||
public static void ClearCacheObjectTypes(string TypeName)
|
||||
{
|
||||
System.Web.Caching.Cache c = System.Web.HttpRuntime.Cache;
|
||||
try
|
||||
{
|
||||
if (c != null)
|
||||
{
|
||||
System.Collections.IDictionaryEnumerator cacheEnumerator = c.GetEnumerator();
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Clears all objects in the System.Web.Cache with the System.Type name as the
|
||||
/// input parameter. (using [object].GetType())
|
||||
/// </summary>
|
||||
/// <param name="TypeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
|
||||
public static void ClearCacheObjectTypes(string TypeName)
|
||||
{
|
||||
System.Web.Caching.Cache c = System.Web.HttpRuntime.Cache;
|
||||
try
|
||||
{
|
||||
if (c != null)
|
||||
{
|
||||
System.Collections.IDictionaryEnumerator cacheEnumerator = c.GetEnumerator();
|
||||
while (cacheEnumerator.MoveNext())
|
||||
{
|
||||
if (cacheEnumerator.Key != null && c[cacheEnumerator.Key.ToString()] != null && c[cacheEnumerator.Key.ToString()].GetType() != null && c[cacheEnumerator.Key.ToString()].GetType().ToString() == TypeName)
|
||||
{
|
||||
c.Remove(cacheEnumerator.Key.ToString());
|
||||
c.Remove(cacheEnumerator.Key.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception CacheE)
|
||||
{
|
||||
BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, BusinessLogic.User.GetUser(0), -1, "CacheClearing : " + CacheE.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception CacheE)
|
||||
{
|
||||
BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, BusinessLogic.User.GetUser(0), -1, "CacheClearing : " + CacheE.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Clears all cache items that starts with the key passed.
|
||||
@@ -95,73 +102,73 @@ namespace umbraco.cms.businesslogic.cache
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Retrieve all cached items
|
||||
/// </summary>
|
||||
/// <returns>A hastable containing all cacheitems</returns>
|
||||
public static System.Collections.Hashtable ReturnCacheItemsOrdred()
|
||||
{
|
||||
System.Collections.Hashtable ht = new System.Collections.Hashtable();
|
||||
System.Web.Caching.Cache c = System.Web.HttpRuntime.Cache;
|
||||
if (c != null)
|
||||
{
|
||||
System.Collections.IDictionaryEnumerator cacheEnumerator = c.GetEnumerator();
|
||||
while ( cacheEnumerator.MoveNext() )
|
||||
{
|
||||
if (ht[c[cacheEnumerator.Key.ToString()].GetType().ToString()] == null)
|
||||
ht.Add(c[cacheEnumerator.Key.ToString()].GetType().ToString(), new System.Collections.ArrayList());
|
||||
/// <summary>
|
||||
/// Retrieve all cached items
|
||||
/// </summary>
|
||||
/// <returns>A hastable containing all cacheitems</returns>
|
||||
public static System.Collections.Hashtable ReturnCacheItemsOrdred()
|
||||
{
|
||||
System.Collections.Hashtable ht = new System.Collections.Hashtable();
|
||||
System.Web.Caching.Cache c = System.Web.HttpRuntime.Cache;
|
||||
if (c != null)
|
||||
{
|
||||
System.Collections.IDictionaryEnumerator cacheEnumerator = c.GetEnumerator();
|
||||
while (cacheEnumerator.MoveNext())
|
||||
{
|
||||
if (ht[c[cacheEnumerator.Key.ToString()].GetType().ToString()] == null)
|
||||
ht.Add(c[cacheEnumerator.Key.ToString()].GetType().ToString(), new System.Collections.ArrayList());
|
||||
|
||||
((System.Collections.ArrayList) ht[c[cacheEnumerator.Key.ToString()].GetType().ToString()]).Add(cacheEnumerator.Key.ToString());
|
||||
}
|
||||
}
|
||||
return ht;
|
||||
}
|
||||
((System.Collections.ArrayList)ht[c[cacheEnumerator.Key.ToString()].GetType().ToString()]).Add(cacheEnumerator.Key.ToString());
|
||||
}
|
||||
}
|
||||
return ht;
|
||||
}
|
||||
|
||||
|
||||
public delegate TT GetCacheItemDelegate<TT>();
|
||||
public delegate TT GetCacheItemDelegate<TT>();
|
||||
|
||||
public static TT GetCacheItem<TT>(string cacheKey, object syncLock,
|
||||
TimeSpan timeout, GetCacheItemDelegate<TT> getCacheItem)
|
||||
{
|
||||
return GetCacheItem(cacheKey, syncLock, null, timeout, getCacheItem);
|
||||
}
|
||||
public static TT GetCacheItem<TT>(string cacheKey, object syncLock,
|
||||
TimeSpan timeout, GetCacheItemDelegate<TT> getCacheItem)
|
||||
{
|
||||
return GetCacheItem(cacheKey, syncLock, null, timeout, getCacheItem);
|
||||
}
|
||||
|
||||
public static TT GetCacheItem<TT>(string cacheKey, object syncLock,
|
||||
CacheItemRemovedCallback refreshAction, TimeSpan timeout,
|
||||
GetCacheItemDelegate<TT> getCacheItem)
|
||||
{
|
||||
return GetCacheItem(cacheKey, syncLock, CacheItemPriority.Normal, refreshAction, timeout, getCacheItem);
|
||||
}
|
||||
public static TT GetCacheItem<TT>(string cacheKey, object syncLock,
|
||||
CacheItemRemovedCallback refreshAction, TimeSpan timeout,
|
||||
GetCacheItemDelegate<TT> getCacheItem)
|
||||
{
|
||||
return GetCacheItem(cacheKey, syncLock, CacheItemPriority.Normal, refreshAction, timeout, getCacheItem);
|
||||
}
|
||||
|
||||
public static TT GetCacheItem<TT>(string cacheKey, object syncLock,
|
||||
CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan timeout,
|
||||
GetCacheItemDelegate<TT> getCacheItem)
|
||||
{
|
||||
return GetCacheItem(cacheKey, syncLock, priority, refreshAction, null, timeout, getCacheItem);
|
||||
}
|
||||
public static TT GetCacheItem<TT>(string cacheKey, object syncLock,
|
||||
CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan timeout,
|
||||
GetCacheItemDelegate<TT> getCacheItem)
|
||||
{
|
||||
return GetCacheItem(cacheKey, syncLock, priority, refreshAction, null, timeout, getCacheItem);
|
||||
}
|
||||
|
||||
public static TT GetCacheItem<TT>(string cacheKey, object syncLock,
|
||||
CacheItemPriority priority, CacheItemRemovedCallback refreshAction,
|
||||
CacheDependency cacheDependency, TimeSpan timeout, GetCacheItemDelegate<TT> getCacheItem)
|
||||
{
|
||||
object result = System.Web.HttpRuntime.Cache.Get(cacheKey);
|
||||
if (result == null)
|
||||
{
|
||||
lock (syncLock)
|
||||
{
|
||||
result = System.Web.HttpRuntime.Cache.Get(cacheKey);
|
||||
if (result == null)
|
||||
{
|
||||
result = getCacheItem();
|
||||
public static TT GetCacheItem<TT>(string cacheKey, object syncLock,
|
||||
CacheItemPriority priority, CacheItemRemovedCallback refreshAction,
|
||||
CacheDependency cacheDependency, TimeSpan timeout, GetCacheItemDelegate<TT> getCacheItem)
|
||||
{
|
||||
object result = System.Web.HttpRuntime.Cache.Get(cacheKey);
|
||||
if (result == null)
|
||||
{
|
||||
lock (syncLock)
|
||||
{
|
||||
result = System.Web.HttpRuntime.Cache.Get(cacheKey);
|
||||
if (result == null)
|
||||
{
|
||||
result = getCacheItem();
|
||||
if (result != null)
|
||||
{
|
||||
System.Web.HttpRuntime.Cache.Add(cacheKey, result, cacheDependency,
|
||||
DateTime.Now.Add(timeout), TimeSpan.Zero, priority, refreshAction);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return (TT)result;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return (TT)result;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user