lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed an issue with rendering shapes from Orchard.exe.

Browse Source 
Fixes #6321
This commit is contained in:
Sipke Schoorstra 2016-01-31 22:43:03 +01:00
parent b9fa87d5e2
commit 59d20c3d40
4 changed files with 8 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Orchard/BackgroundHttpContextFactory.cs
View File

@ -1,33 +0,0 @@
using System.IO;
using System.Web;
using Orchard.Settings;
namespace Orchard {
/// <summary>
/// A factory class that creates an HttpContext instance and initializes the HttpContext.Current property with that instance.
/// This is useful when rendering views from a background thread, as some Html Helpers access HttpContext.Current directly, thus preventing a NullReferenceException.
/// </summary>
public class BackgroundHttpContextFactory : IBackgroundHttpContextFactory {
public const string IsBackgroundHttpContextKey = "IsBackgroundHttpContext";
private readonly ISiteService _siteService;
public BackgroundHttpContextFactory(ISiteService siteService) {
_siteService = siteService;
}
public HttpContext CreateHttpContext() {
var url = _siteService.GetSiteSettings().BaseUrl;
var httpContext = new HttpContext(new HttpRequest("", url, ""), new HttpResponse(new StringWriter()));
httpContext.Items[IsBackgroundHttpContextKey] = true;
return httpContext;
}
public void InitializeHttpContext() {
if (HttpContext.Current != null)
return;
HttpContext.Current = CreateHttpContext();
}
}
}

12
src/Orchard/Environment/State/ContextState.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Runtime.Remoting.Messaging;
using System.Web;
using Orchard.Mvc;
namespace Orchard.Environment.State {
@ -22,7 +23,7 @@ namespace Orchard.Environment.State {
}
public T GetState() {
if (HttpContext.Current == null) {
if (!HttpContextIsValid()) {
var data = CallContext.GetData(_name);
if (data == null) {
@ -44,13 +45,16 @@ namespace Orchard.Environment.State {
}
public void SetState(T state) {
if (HttpContext.Current == null) {
if (!HttpContextIsValid()) {
CallContext.SetData(_name, state);
}
else {
HttpContext.Current.Items[_name] = state;
}
}
}
}
private bool HttpContextIsValid() {
return HttpContext.Current != null && !HttpContext.Current.Items.Contains(MvcModule.IsBackgroundHttpContextKey);
}
}
}

8
src/Orchard/IBackgroundHttpContextFactory.cs
View File

@ -1,8 +0,0 @@
using System.Web;
namespace Orchard {
public interface IBackgroundHttpContextFactory : IDependency {
HttpContext CreateHttpContext();
void InitializeHttpContext();
}
}

2
src/Orchard/Orchard.Framework.csproj
View File

@ -168,7 +168,6 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="BackgroundHttpContextFactory.cs" />
<Compile Include="ContentManagement\Handlers\CloneContentContext.cs" />
<Compile Include="Environment\Configuration\ExtensionLocations.cs" />
<Compile Include="DisplayManagement\IPositioned.cs" />
@ -177,7 +176,6 @@
<Compile Include="Data\Migration\Schema\DropUniqueConstraintCommand.cs" />
<Compile Include="Environment\Extensions\Models\LifecycleStatus.cs" />
<Compile Include="Environment\ShellBuilders\ICompositionStrategy.cs" />
<Compile Include="IBackgroundHttpContextFactory.cs" />
<Compile Include="Mvc\Updater.cs" />
<Compile Include="Recipes\Models\ConfigurationContext.cs" />
<Compile Include="Recipes\Models\RecipeBuilderStepConfigurationContext.cs" />