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

Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent

Browse Source
This commit is contained in:
Stephan
2013-10-02 11:43:10 +02:00
parent e5b3ca1907 e6bb999d83
commit 520ebc3394
6 changed files with 110 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();
}
}
}
}

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

@@ -1,5 +1,7 @@
using System;
using System.Linq;
using System.Threading;
using Umbraco.Core.Logging;
namespace Umbraco.Core.ObjectResolution
{
@@ -12,9 +14,10 @@ namespace Umbraco.Core.ObjectResolution
/// </remarks>
internal static class Resolution
{
private static readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim();
private static readonly ReaderWriterLockSlim ConfigurationLock = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
private volatile static bool _isFrozen;
/// <summary>
/// <summary>
/// Occurs when resolution is frozen.
/// </summary>
/// <remarks>Occurs only once, since resolution can be frozen only once.</remarks>
@@ -23,14 +26,27 @@ namespace Umbraco.Core.ObjectResolution
/// <summary>
/// Gets or sets a value indicating whether resolution of objects is frozen.
/// </summary>
public static bool IsFrozen { get; private set; }
public static void EnsureIsFrozen()
// internal for unit tests, use ReadFrozen if you want to be sure
internal static bool IsFrozen
{
if (!IsFrozen)
throw new InvalidOperationException("Resolution is not frozen, it is not yet possible to get values from it.");
get
{
using (new ReadLock(ConfigurationLock))
{
return _isFrozen;
}
}
}
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.
/// </summary>
@@ -39,13 +55,11 @@ namespace Umbraco.Core.ObjectResolution
{
get
{
IDisposable l = new WriteLock(_lock);
if (Resolution.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.");
}
}
@@ -65,21 +79,24 @@ namespace Umbraco.Core.ObjectResolution
// keep the class here because it needs write-access to Resolution.IsFrozen
private class DirtyBackdoor : IDisposable
{
private static readonly System.Threading.ReaderWriterLockSlim _dirtyLock = new ReaderWriterLockSlim();
private IDisposable _lock;
private bool _frozen;
private readonly IDisposable _lock;
private readonly bool _frozen;
public DirtyBackdoor()
{
_lock = new WriteLock(_dirtyLock);
_frozen = Resolution.IsFrozen;
Resolution.IsFrozen = false;
LogHelper.Debug(typeof(DirtyBackdoor), "Creating back door for resolution");
_lock = new WriteLock(ConfigurationLock);
_frozen = _isFrozen;
_isFrozen = false;
}
public void Dispose()
{
Resolution.IsFrozen = _frozen;
LogHelper.Debug(typeof(DirtyBackdoor), "Disposing back door for resolution");
_isFrozen = _frozen;
_lock.Dispose();
}
}
@@ -90,11 +107,17 @@ namespace Umbraco.Core.ObjectResolution
/// <exception cref="InvalidOperationException">resolution is already frozen.</exception>
public static void Freeze()
{
if (Resolution.IsFrozen)
throw new InvalidOperationException("Resolution is frozen. It is not possible to freeze it again.");
LogHelper.Debug(typeof(Resolution), "Freezing resolution");
IsFrozen = true;
if (Frozen != null)
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)
Frozen(null, null);
}
@@ -104,7 +127,20 @@ namespace Umbraco.Core.ObjectResolution
/// <remarks>To be used in unit tests.</remarks>
internal static void Reset()
{
IsFrozen = false;
LogHelper.Debug(typeof(Resolution), "Resetting resolution");
/*
var trace = new System.Diagnostics.StackTrace();
var testing = trace.GetFrames().Any(frame =>
frame.GetMethod().DeclaringType.FullName.StartsWith("Umbraco.Tests"));
if (testing == false)
throw new InvalidOperationException("Only unit tests can reset configuration.");
*/
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]

7
src/Umbraco.Web/umbraco.presentation/macro.cs
View File

@@ -1344,8 +1344,11 @@ namespace umbraco
break;
case "mediaCurrent":
var c = new Content(int.Parse(macroPropertyValue));
macroXmlNode.AppendChild(macroXml.ImportNode(c.ToXml(umbraco.content.Instance.XmlContent, false), true));
if (string.IsNullOrEmpty(macroPropertyValue) == false)
{
var c = new Content(int.Parse(macroPropertyValue));
macroXmlNode.AppendChild(macroXml.ImportNode(c.ToXml(umbraco.content.Instance.XmlContent, false), true));
}
break;
default:

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

@@ -56,7 +56,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!