From 759a3619ca723053e135ab196c93d966a4759e61 Mon Sep 17 00:00:00 2001 From: Stephan Date: Wed, 2 Oct 2013 11:48:30 +0200 Subject: [PATCH 1/2] Core.Resolution - fix concurrency issues --- src/Umbraco.Core/ObjectResolution/Resolution.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Core/ObjectResolution/Resolution.cs b/src/Umbraco.Core/ObjectResolution/Resolution.cs index b6d44a2b15..0f196d9338 100644 --- a/src/Umbraco.Core/ObjectResolution/Resolution.cs +++ b/src/Umbraco.Core/ObjectResolution/Resolution.cs @@ -126,7 +126,7 @@ namespace Umbraco.Core.ObjectResolution /// To be used in unit tests. internal static void Reset() { - LogHelper.Debug(typeof(DirtyBackdoor), "Resetting resolution"); + LogHelper.Debug(typeof(Resolution), "Resetting resolution"); using (new WriteLock(ConfigurationLock)) { From 65898411e77b7c8676ef60446041da75b313d07a Mon Sep 17 00:00:00 2001 From: Stephan Date: Wed, 2 Oct 2013 11:42:17 +0200 Subject: [PATCH 2/2] Core.Resolution - umbraco.cms.Action should NOT reset resolution --- src/umbraco.cms/Actions/Action.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/umbraco.cms/Actions/Action.cs b/src/umbraco.cms/Actions/Action.cs index 6b8001d572..e29546d8ca 100644 --- a/src/umbraco.cms/Actions/Action.cs +++ b/src/umbraco.cms/Actions/Action.cs @@ -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!