lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Update WorkContextAccessor.cs

Browse Source
This commit is contained in:
jtkech
2015-12-11 01:31:00 +01:00
parent 9593155cb6
commit a7b4d8c6ca
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Orchard/Environment/WorkContextAccessor.cs
View File

@@ -16,19 +16,21 @@ namespace Orchard.Environment {
// a different symbolic key is used for each tenant. // a different symbolic key is used for each tenant.
// this guarantees the correct accessor is being resolved. // this guarantees the correct accessor is being resolved.
readonly object _workContextKey = new object(); readonly object _workContextKey = new object();
private readonly string _workContextSlot;
public WorkContextAccessor( public WorkContextAccessor(
IHttpContextAccessor httpContextAccessor, IHttpContextAccessor httpContextAccessor,
ILifetimeScope lifetimeScope) { ILifetimeScope lifetimeScope) {
_httpContextAccessor = httpContextAccessor; _httpContextAccessor = httpContextAccessor;
_lifetimeScope = lifetimeScope; _lifetimeScope = lifetimeScope;
_workContextSlot = "WorkContext." + Guid.NewGuid().ToString("n");
} }
public WorkContext GetContext(HttpContextBase httpContext) { public WorkContext GetContext(HttpContextBase httpContext) {
if (!httpContext.IsBackgroundContext()) if (!httpContext.IsBackgroundContext())
return httpContext.Items[_workContextKey] as WorkContext; return httpContext.Items[_workContextKey] as WorkContext;
var context = CallContext.LogicalGetData("WorkContext") as ObjectHandle; var context = CallContext.LogicalGetData(_workContextSlot) as ObjectHandle;
return context != null ? context.Unwrap() as WorkContext : null; return context != null ? context.Unwrap() as WorkContext : null;
} }
@@ -37,7 +39,7 @@ namespace Orchard.Environment {
if (!httpContext.IsBackgroundContext()) if (!httpContext.IsBackgroundContext())
return GetContext(httpContext); return GetContext(httpContext);
var context = CallContext.LogicalGetData("WorkContext") as ObjectHandle; var context = CallContext.LogicalGetData(_workContextSlot) as ObjectHandle;
return context != null ? context.Unwrap() as WorkContext : null; return context != null ? context.Unwrap() as WorkContext : null;
} }
@@ -65,7 +67,7 @@ namespace Orchard.Environment {
var events = workLifetime.Resolve<IEnumerable<IWorkContextEvents>>(); var events = workLifetime.Resolve<IEnumerable<IWorkContextEvents>>();
events.Invoke(e => e.Started(), NullLogger.Instance); events.Invoke(e => e.Started(), NullLogger.Instance);
return new CallContextScopeImplementation(events, workLifetime); return new CallContextScopeImplementation(events, workLifetime, _workContextSlot);
} }
class HttpContextScopeImplementation : IWorkContextScope { class HttpContextScopeImplementation : IWorkContextScope {
@@ -105,18 +107,19 @@ namespace Orchard.Environment {
readonly WorkContext _workContext; readonly WorkContext _workContext;
readonly Action _disposer; readonly Action _disposer;
public CallContextScopeImplementation(IEnumerable<IWorkContextEvents> events, ILifetimeScope lifetimeScope) { public CallContextScopeImplementation(IEnumerable<IWorkContextEvents> events, ILifetimeScope lifetimeScope, string workContextSlot) {
_workContext = lifetimeScope.Resolve<WorkContext>();
CallContext.LogicalSetData("WorkContext", new ObjectHandle(_workContext));
CallContext.LogicalSetData("HttpContext", null); CallContext.LogicalSetData(workContextSlot, null);
_workContext = lifetimeScope.Resolve<WorkContext>();
var httpContext = lifetimeScope.Resolve<HttpContextBase>(); var httpContext = lifetimeScope.Resolve<HttpContextBase>();
CallContext.LogicalSetData("HttpContext", new ObjectHandle(httpContext)); _workContext.HttpContext = httpContext;
CallContext.LogicalSetData(workContextSlot, new ObjectHandle(_workContext));
_disposer = () => { _disposer = () => {
events.Invoke(e => e.Finished(), NullLogger.Instance); events.Invoke(e => e.Finished(), NullLogger.Instance);
CallContext.FreeNamedDataSlot("WorkContext"); CallContext.FreeNamedDataSlot(workContextSlot);
CallContext.FreeNamedDataSlot("HttpContext");
lifetimeScope.Dispose(); lifetimeScope.Dispose();
}; };
} }