lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-19 01:57:55 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '1.8.x' into 1.x

Browse Source
This commit is contained in:
Zoltán Lehóczky
2014-08-14 00:36:50 +02:00
parent 221197f314 780fc2a15f
commit 5bebeb85f0
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Orchard/Environment/DefaultOrchardHost.cs
View File

@@ -277,22 +277,25 @@ namespace Orchard.Environment {
// terminate the shell if the tenant was disabled // terminate the shell if the tenant was disabled
else if (settings.State == TenantState.Disabled) { else if (settings.State == TenantState.Disabled) {
shellContext.Shell.Terminate(); shellContext.Shell.Terminate();
shellContext.Dispose();
_runningShellTable.Remove(settings); _runningShellTable.Remove(settings);
_shellContexts = _shellContexts.Where(shell => shell.Settings.Name != settings.Name); // Forcing enumeration with ToArray() so a lazy execution isn't causing issues by accessing the disposed context.
_shellContexts = _shellContexts.Where(shell => shell.Settings.Name != settings.Name).ToArray();
shellContext.Dispose();
} }
// reload the shell as its settings have changed // reload the shell as its settings have changed
else { else {
// dispose previous context // dispose previous context
shellContext.Shell.Terminate(); shellContext.Shell.Terminate();
shellContext.Dispose();
var context = _shellContextFactory.CreateShellContext(settings); var context = _shellContextFactory.CreateShellContext(settings);
// activate and register modified context // Sctivate and register modified context.
_shellContexts = _shellContexts.Where(shell => shell.Settings.Name != settings.Name).Union(new[] { context }); // Forcing enumeration with ToArray() so a lazy execution isn't causing issues by accessing the disposed shell context.
_shellContexts = _shellContexts.Where(shell => shell.Settings.Name != settings.Name).Union(new[] { context }).ToArray();
shellContext.Dispose();
context.Shell.Activate(); context.Shell.Activate();
_runningShellTable.Update(settings); _runningShellTable.Update(settings);