From abed55164d8a8b853d42a19fcef35102ccba77b7 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastien.ros@microsoft.com>
Date: Fri, 26 Sep 2014 12:54:40 -0700
Subject: [PATCH] Fixing performance issue in OutputCache

---
 .../Orchard.Email/Services/MissingSettingsBanner.cs    |  2 --
 .../Orchard.OutputCache/Filters/OutputCacheFilter.cs   | 10 +++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Email/Services/MissingSettingsBanner.cs b/src/Orchard.Web/Modules/Orchard.Email/Services/MissingSettingsBanner.cs
index c91e66f85..9c627bbf8 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Services/MissingSettingsBanner.cs
+++ b/src/Orchard.Web/Modules/Orchard.Email/Services/MissingSettingsBanner.cs
@@ -22,8 +22,6 @@ namespace Orchard.Email.Services {
             var workContext = _orchardServices.WorkContext;
             var smtpSettings = workContext.CurrentSite.As<SmtpSettingsPart>();
 
-            var smtpClient = new SmtpClient();
-
             if (smtpSettings == null || !smtpSettings.IsValid()) {
                 var urlHelper = new UrlHelper(workContext.HttpContext.Request.RequestContext);
                 var url = urlHelper.Action("Email", "Admin", new {Area = "Settings"});
diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
index dbba938d6..f8033c3df 100644
--- a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
+++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
@@ -23,6 +23,7 @@ using Orchard.Utility.Extensions;
 using System.Collections.Specialized;
 using Orchard.OutputCache.ViewModels;
 using Orchard.UI.Admin.Notification;
+using Orchard.DisplayManagement.Shapes;
 
 namespace Orchard.OutputCache.Filters {
     public class OutputCacheFilter : FilterProvider, IActionFilter, IResultFilter {
@@ -38,7 +39,6 @@ namespace Orchard.OutputCache.Filters {
         private readonly ISignals _signals;
         private readonly ShellSettings _shellSettings;
         private readonly ICacheControlStrategy _cacheControlStrategy;
-        private readonly INotificationManager _notificationManager;
 
         TextWriter _originalWriter;
         StringWriter _cachingWriter;
@@ -57,8 +57,7 @@ namespace Orchard.OutputCache.Filters {
             ICacheService cacheService,
             ISignals signals,
             ShellSettings shellSettings,
-            ICacheControlStrategy cacheControlStrategy,
-            INotificationManager notificationManager 
+            ICacheControlStrategy cacheControlStrategy
             ) {
             _cacheManager = cacheManager;
             _cacheStorageProvider = cacheStorageProvider;
@@ -71,7 +70,6 @@ namespace Orchard.OutputCache.Filters {
             _signals = signals;
             _shellSettings = shellSettings;
             _cacheControlStrategy = cacheControlStrategy;
-            _notificationManager = notificationManager;
 
             Logger = NullLogger.Instance;
         }
@@ -345,7 +343,9 @@ namespace Orchard.OutputCache.Filters {
             }
 
             // don't cache the result if there were some notifications
-            if (_notificationManager.GetNotifications().Any()) {
+            // notifications can come from Notifier and NotificationProvider
+            var messagesZone = _workContextAccessor.GetContext(filterContext).Layout.Zones["Messages"] as Shape;
+            if (messagesZone != null && messagesZone.Items.Any()) {
                 return;
             }