From b8acabd3e02ceaad836c852f89490fb914d4d854 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipke@ideliverable.com>
Date: Wed, 28 Sep 2016 16:15:51 +0200
Subject: [PATCH] Wrapped owin middleware config

This wraps owin middle ware configuration within a work context scope.

Fixes #6991
---
 src/Orchard/Environment/DefaultOrchardShell.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Orchard/Environment/DefaultOrchardShell.cs b/src/Orchard/Environment/DefaultOrchardShell.cs
index 41e02abdf..77da6da28 100644
--- a/src/Orchard/Environment/DefaultOrchardShell.cs
+++ b/src/Orchard/Environment/DefaultOrchardShell.cs
@@ -55,12 +55,14 @@ namespace Orchard.Environment {
             var appBuilder = new AppBuilder();
             appBuilder.Properties["host.AppName"] = _shellSettings.Name;
 
-            var orderedMiddlewares = _owinMiddlewareProviders
-                .SelectMany(p => p.GetOwinMiddlewares())
-                .OrderBy(obj => obj.Priority, new FlatPositionComparer());
+            using (var scope = _workContextAccessor.CreateWorkContextScope()) {
+                var orderedMiddlewares = _owinMiddlewareProviders
+                    .SelectMany(p => p.GetOwinMiddlewares())
+                    .OrderBy(obj => obj.Priority, new FlatPositionComparer());
 
-            foreach (var middleware in orderedMiddlewares) {
-                middleware.Configure(appBuilder);
+                foreach (var middleware in orderedMiddlewares) {
+                    middleware.Configure(appBuilder);
+                }
             }
 
             // Register the Orchard middleware after all others.