Update HttpContextAccessor.cs

This commit is contained in:
jtkech
2015-10-20 05:44:28 +02:00
parent 9bdf130cc9
commit afd80a8c72

View File

@@ -1,13 +1,16 @@
using System;
using System;
using System.Runtime.Remoting.Messaging;
using System.Web;
namespace Orchard.Mvc {
public class HttpContextAccessor : IHttpContextAccessor {
private HttpContextBase _httpContext;
public HttpContextBase Current() {
var httpContext = GetStaticProperty();
return !IsBackgroundHttpContext(httpContext) ? new HttpContextWrapper(httpContext) : _httpContext;
return !IsBackgroundHttpContext(httpContext) ? new HttpContextWrapper(httpContext) :
_httpContext ?? CallContext.LogicalGetData("HttpContext") as HttpContextBase;
}
public void Set(HttpContextBase httpContext) {
@@ -15,7 +18,7 @@ namespace Orchard.Mvc {
}
private static bool IsBackgroundHttpContext(HttpContext httpContext) {
return httpContext == null || httpContext.Items.Contains(BackgroundHttpContextFactory.IsBackgroundHttpContextKey);
return httpContext == null || httpContext.Items.Contains(MvcModule.IsBackgroundHttpContextKey);
}
private static HttpContext GetStaticProperty() {
@@ -36,4 +39,4 @@ namespace Orchard.Mvc {
return httpContext;
}
}
}
}