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

Update HttpContextAccessor.cs

Browse Source
This commit is contained in:
jtkech
2015-12-17 07:08:12 +01:00
parent 5f65c5101d
commit 981c1cb056
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard/Mvc/HttpContextAccessor.cs
View File

@@ -6,6 +6,7 @@ namespace Orchard.Mvc {
public class HttpContextAccessor : IHttpContextAccessor { public class HttpContextAccessor : IHttpContextAccessor {
readonly ILifetimeScope _lifetimeScope; readonly ILifetimeScope _lifetimeScope;
private HttpContextBase _httpContext; private HttpContextBase _httpContext;
private IWorkContextAccessor _wca;
public HttpContextAccessor(ILifetimeScope lifetimeScope) { public HttpContextAccessor(ILifetimeScope lifetimeScope) {
_lifetimeScope = lifetimeScope; _lifetimeScope = lifetimeScope;
@@ -20,9 +21,10 @@ namespace Orchard.Mvc {
if (_httpContext != null) if (_httpContext != null)
return _httpContext; return _httpContext;
var workContext = _lifetimeScope.IsRegistered<IWorkContextAccessor>() ? if (_wca == null && _lifetimeScope.IsRegistered<IWorkContextAccessor>())
_lifetimeScope.Resolve<IWorkContextAccessor>().GetContext(null) : null; _wca = _lifetimeScope.Resolve<IWorkContextAccessor>();
var workContext = _wca != null ? _wca.GetContext(null) : null;
return workContext != null ? workContext.HttpContext : null; return workContext != null ? workContext.HttpContext : null;
} }