From 4491ab84676b884a4a868be603be76fe0e5df1b2 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastienros@gmail.com>
Date: Fri, 4 Sep 2015 16:31:09 -0700
Subject: [PATCH] Fixing WorkContext resolution

c.f. https://github.com/OrchardCMS/Orchard/pull/5723#issuecomment-137846843
---
 src/Orchard/Environment/WorkContextImplementation.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Orchard/Environment/WorkContextImplementation.cs b/src/Orchard/Environment/WorkContextImplementation.cs
index 85a5f9fda..fe9e639f5 100644
--- a/src/Orchard/Environment/WorkContextImplementation.cs
+++ b/src/Orchard/Environment/WorkContextImplementation.cs
@@ -8,11 +8,11 @@ namespace Orchard.Environment {
     class WorkContextImplementation : WorkContext {
         readonly IComponentContext _componentContext;
         readonly ConcurrentDictionary<string, Func<object>> _stateResolvers = new ConcurrentDictionary<string, Func<object>>();
-        readonly IEnumerable<IWorkContextStateProvider> _workContextStateProviders;
+        readonly IEnumerable<Lazy<IWorkContextStateProvider>> _workContextStateProviders;
 
         public WorkContextImplementation(IComponentContext componentContext) {
             _componentContext = componentContext;
-            _workContextStateProviders = componentContext.Resolve<IEnumerable<IWorkContextStateProvider>>();
+            _workContextStateProviders = componentContext.Resolve<IEnumerable<Lazy<IWorkContextStateProvider>>>();
         }
 
         public override T Resolve<T>() {
@@ -29,7 +29,7 @@ namespace Orchard.Environment {
         }
 
         Func<object> FindResolverForState<T>(string name) {
-            var resolver = _workContextStateProviders.Select(wcsp => wcsp.Get<T>(name)).FirstOrDefault(value => !Equals(value, default(T)));
+            var resolver = _workContextStateProviders.Select(wcsp => wcsp.Value.Get<T>(name)).FirstOrDefault(value => !Equals(value, default(T)));
 
             if (resolver == null) {
                 return () => default(T);