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

Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

Browse Source
This commit is contained in:
Shannon
2013-10-02 20:00:34 +10:00
parent 89f7a31bef 65898411e7
commit 8f53bea3d7
5 changed files with 83 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs
View File

@@ -169,47 +169,46 @@ namespace Umbraco.Core.ObjectResolution
{
get
{
// ensure we can
if (CanResolveBeforeFrozen == false)
Resolution.EnsureIsFrozen();
using (Resolution.Reader(CanResolveBeforeFrozen))
{
// note: we apply .ToArray() to the output of CreateInstance() because that is an IEnumerable that
// comes from the PluginManager we want to be _sure_ that it's not a Linq of some sort, but the
// instances have actually been instanciated when we return.
// note: we apply .ToArray() to the output of CreateInstance() because that is an IEnumerable that
// comes from the PluginManager we want to be _sure_ that it's not a Linq of some sort, but the
// instances have actually been instanciated when we return.
switch (LifetimeScope)
{
case ObjectLifetimeScope.HttpRequest:
// create new instances per HttpContext
using (var l = new UpgradeableReadLock(_lock))
{
// create if not already there
if (CurrentHttpContext.Items[_httpContextKey] == null)
{
l.UpgradeToWriteLock();
CurrentHttpContext.Items[_httpContextKey] = CreateInstances().ToArray();
}
return (TResolved[])CurrentHttpContext.Items[_httpContextKey];
}
switch (LifetimeScope)
{
case ObjectLifetimeScope.HttpRequest:
// create new instances per HttpContext
using (var l = new UpgradeableReadLock(_lock))
{
// create if not already there
if (CurrentHttpContext.Items[_httpContextKey] == null)
{
l.UpgradeToWriteLock();
CurrentHttpContext.Items[_httpContextKey] = CreateInstances().ToArray();
}
return (TResolved[])CurrentHttpContext.Items[_httpContextKey];
}
case ObjectLifetimeScope.Application:
// create new instances per application
using (var l = new UpgradeableReadLock(_lock))
{
// create if not already there
if (_applicationInstances == null)
{
l.UpgradeToWriteLock();
_applicationInstances = CreateInstances().ToArray();
}
return _applicationInstances;
}
case ObjectLifetimeScope.Application:
// create new instances per application
using(var l = new UpgradeableReadLock(_lock))
{
// create if not already there
if (_applicationInstances == null)
{
l.UpgradeToWriteLock();
_applicationInstances = CreateInstances().ToArray();
}
return _applicationInstances;
}
case ObjectLifetimeScope.Transient:
default:
// create new instances each time
return CreateInstances().ToArray();
}
case ObjectLifetimeScope.Transient:
default:
// create new instances each time
return CreateInstances().ToArray();
}
}
}
}

68
src/Umbraco.Core/ObjectResolution/Resolution.cs
View File

@@ -13,8 +13,8 @@ namespace Umbraco.Core.ObjectResolution
/// </remarks>
internal static class Resolution
{
private static readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim();
private volatile static bool _isFrozen;
private static readonly ReaderWriterLockSlim ConfigurationLock = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
private volatile static bool _isFrozen;
/// <summary>
/// Occurs when resolution is frozen.
@@ -25,18 +25,26 @@ namespace Umbraco.Core.ObjectResolution
/// <summary>
/// Gets or sets a value indicating whether resolution of objects is frozen.
/// </summary>
public static bool IsFrozen
// internal for unit tests, use ReadFrozen if you want to be sure
internal static bool IsFrozen
{
get { return _isFrozen; }
get
{
using (new ReadLock(ConfigurationLock))
{
return _isFrozen;
}
}
}
public static void EnsureIsFrozen()
{
if (!_isFrozen)
{
throw new InvalidOperationException("Resolution is not frozen, it is not yet possible to get values from it.");
}
}
public static IDisposable Reader(bool canReadUnfrozen = false)
{
IDisposable l = new ReadLock(ConfigurationLock);
if (canReadUnfrozen || _isFrozen) return l;
l.Dispose();
throw new InvalidOperationException("Resolution is not frozen, it is not yet possible to get values from it.");
}
/// <summary>
/// Returns a disposable object that represents safe access to unfrozen resolution configuration.
@@ -46,13 +54,11 @@ namespace Umbraco.Core.ObjectResolution
{
get
{
IDisposable l = new WriteLock(_lock);
if (_isFrozen)
{
l.Dispose();
throw new InvalidOperationException("Resolution is frozen, it is not possible to configure it anymore.");
}
return l;
IDisposable l = new WriteLock(ConfigurationLock);
if (_isFrozen == false) return l;
l.Dispose();
throw new InvalidOperationException("Resolution is frozen, it is not possible to configure it anymore.");
}
}
@@ -72,16 +78,15 @@ namespace Umbraco.Core.ObjectResolution
// keep the class here because it needs write-access to Resolution.IsFrozen
private class DirtyBackdoor : IDisposable
{
private static readonly ReaderWriterLockSlim DirtyLock = new ReaderWriterLockSlim();
private IDisposable _lock;
private bool _frozen;
private readonly IDisposable _lock;
private readonly bool _frozen;
public DirtyBackdoor()
{
LogHelper.Debug(typeof(DirtyBackdoor), "Creating back door for resolution");
_lock = new WriteLock(DirtyLock);
_lock = new WriteLock(ConfigurationLock);
_frozen = _isFrozen;
_isFrozen = false;
}
@@ -103,11 +108,15 @@ namespace Umbraco.Core.ObjectResolution
{
LogHelper.Debug(typeof(Resolution), "Freezing resolution");
if (_isFrozen)
throw new InvalidOperationException("Resolution is frozen. It is not possible to freeze it again.");
using (new WriteLock(ConfigurationLock))
{
if (_isFrozen)
throw new InvalidOperationException("Resolution is frozen. It is not possible to freeze it again.");
_isFrozen = true;
if (Frozen != null)
_isFrozen = true;
}
if (Frozen != null)
Frozen(null, null);
}
@@ -117,9 +126,12 @@ namespace Umbraco.Core.ObjectResolution
/// <remarks>To be used in unit tests.</remarks>
internal static void Reset()
{
LogHelper.Debug(typeof(DirtyBackdoor), "Resetting resolution");
LogHelper.Debug(typeof(Resolution), "Resetting resolution");
_isFrozen = false;
using (new WriteLock(ConfigurationLock))
{
_isFrozen = false;
}
Frozen = null;
}
}

5
src/Umbraco.Core/ObjectResolution/SingleObjectResolverBase.cs
View File

@@ -102,10 +102,7 @@ namespace Umbraco.Core.ObjectResolution
{
get
{
// ensure we can
if (CanResolveBeforeFrozen == false)
Resolution.EnsureIsFrozen();
using (Resolution.Reader(CanResolveBeforeFrozen))
using (new ReadLock(_lock))
{
if (!_canBeNull && _value == null)

6
src/Umbraco.Tests/Resolvers/ResolutionTests.cs
View File

@@ -87,14 +87,16 @@ namespace Umbraco.Tests.Resolvers
[ExpectedException(typeof(InvalidOperationException))]
public void ResolutionCanDetectIfNotFrozen()
{
Resolution.EnsureIsFrozen(); // throws
using (Resolution.Reader()) // throws
{}
}
[Test]
public void ResolutionCanEnsureIsFrozen()
{
Resolution.Freeze();
Resolution.EnsureIsFrozen();
using (Resolution.Reader()) // ok
{}
}
[Test]

2
src/umbraco.cms/Actions/Action.cs
View File

@@ -57,7 +57,7 @@ namespace umbraco.BusinessLogic.Actions
using (Umbraco.Core.ObjectResolution.Resolution.DirtyBackdoorToConfiguration)
{
//TODO: Based on the above, this is a big hack as types should all be cleared on package install!
ActionsResolver.Reset();
ActionsResolver.Reset(false); // and do NOT reset the whole resolution!
ActionHandlers.Clear();
//TODO: Based on the above, this is a big hack as types should all be cleared on package install!