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 HttpContextAccessor.cs

Browse Source
This commit is contained in:
jtkech
2015-12-08 20:56:20 +01:00
parent f3b3e0a7fb
commit 9593155cb6
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
using System; using System;
using System.Runtime.Remoting;
using System.Runtime.Remoting.Messaging; using System.Runtime.Remoting.Messaging;
using System.Web; using System.Web;
@@ -9,8 +10,15 @@ namespace Orchard.Mvc {
public HttpContextBase Current() { public HttpContextBase Current() {
var httpContext = GetStaticProperty(); var httpContext = GetStaticProperty();
return !IsBackgroundHttpContext(httpContext) ? new HttpContextWrapper(httpContext) :
_httpContext ?? CallContext.LogicalGetData("HttpContext") as HttpContextBase; if (!IsBackgroundHttpContext(httpContext))
return new HttpContextWrapper(httpContext);
if (_httpContext != null)
return _httpContext;
var context = CallContext.LogicalGetData("HttpContext") as ObjectHandle;
return context != null ? context.Unwrap() as HttpContextBase : null;
} }
public void Set(HttpContextBase httpContext) { public void Set(HttpContextBase httpContext) {