lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

#20928: Preventing race condition when starting shells

Browse Source 
Work Item: 20928
This commit is contained in:
Lombiq
2015-01-25 22:33:27 +01:00
committed by Zoltán Lehóczky
parent 29e373202a
commit 22ee57582d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard/Environment/DefaultOrchardHost.cs
+3
View File
@@ -26,6 +26,7 @@ namespace Orchard.Environment {
private readonly IExtensionMonitoringCoordinator _extensionMonitoringCoordinator; private readonly IExtensionMonitoringCoordinator _extensionMonitoringCoordinator;
private readonly ICacheManager _cacheManager; private readonly ICacheManager _cacheManager;
private readonly static object _syncLock = new object(); private readonly static object _syncLock = new object();
private readonly static object _shellContextsWriteLock = new object();
private IEnumerable<ShellContext> _shellContexts; private IEnumerable<ShellContext> _shellContexts;
@@ -158,10 +159,12 @@ namespace Orchard.Environment {
Logger.Debug("Activating context for tenant {0}", context.Settings.Name); Logger.Debug("Activating context for tenant {0}", context.Settings.Name);
context.Shell.Activate(); context.Shell.Activate();
lock (_shellContextsWriteLock) {
_shellContexts = (_shellContexts ?? Enumerable.Empty<ShellContext>()) _shellContexts = (_shellContexts ?? Enumerable.Empty<ShellContext>())
.Where(c => c.Settings.Name != context.Settings.Name) .Where(c => c.Settings.Name != context.Settings.Name)
.Concat(new[] { context }) .Concat(new[] { context })
.ToArray(); .ToArray();
}
_runningShellTable.Add(context.Settings); _runningShellTable.Add(context.Settings);
} }