From 9593155cb6eeed049c96d1eb633695bfd727d336 Mon Sep 17 00:00:00 2001
From: jtkech <jean-thierry.kechichian@wanadoo.fr>
Date: Tue, 8 Dec 2015 20:56:20 +0100
Subject: [PATCH] Update HttpContextAccessor.cs

---
 src/Orchard/Mvc/HttpContextAccessor.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Orchard/Mvc/HttpContextAccessor.cs b/src/Orchard/Mvc/HttpContextAccessor.cs
index f2e35cbab..bb1904df1 100644
--- a/src/Orchard/Mvc/HttpContextAccessor.cs
+++ b/src/Orchard/Mvc/HttpContextAccessor.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.Remoting;
 using System.Runtime.Remoting.Messaging;
 using System.Web;
 
@@ -9,8 +10,15 @@ namespace Orchard.Mvc {
 
         public HttpContextBase Current() {
             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) {