From d90115bec314584b0166b645e95c565414d738b9 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Thu, 2 Feb 2012 10:39:17 -0800
Subject: [PATCH] Preventing multiple queries on assembly loaders

--HG--
branch : 1.x
---
 src/Orchard/Environment/IAssemblyLoader.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Orchard/Environment/IAssemblyLoader.cs b/src/Orchard/Environment/IAssemblyLoader.cs
index f757fdc87..e111bd712 100644
--- a/src/Orchard/Environment/IAssemblyLoader.cs
+++ b/src/Orchard/Environment/IAssemblyLoader.cs
@@ -15,7 +15,7 @@ namespace Orchard.Environment {
         private readonly ConcurrentDictionary<string, Assembly> _loadedAssemblies = new ConcurrentDictionary<string, Assembly>(StringComparer.OrdinalIgnoreCase);
 
         public DefaultAssemblyLoader(IEnumerable<IAssemblyNameResolver> assemblyNameResolvers) {
-            _assemblyNameResolvers = assemblyNameResolvers.OrderBy(l => l.Order);
+            _assemblyNameResolvers = assemblyNameResolvers.OrderBy(l => l.Order).ToList();
             Logger = NullLogger.Instance;
         }
 
@@ -47,7 +47,7 @@ namespace Orchard.Environment {
                 return result;
 
             // Try resolving the short name to a full name
-            var resolvedName = _assemblyNameResolvers.Select(r => r.Resolve(shortName)).Where(f => f != null).FirstOrDefault();
+            var resolvedName = _assemblyNameResolvers.Select(r => r.Resolve(shortName)).FirstOrDefault(f => f != null);
             if (resolvedName != null) {
                 return Assembly.Load(resolvedName);
             }