From 00e2a8f9dc4b5b7658bbbf7a3b7c4cd90e7bcb1c Mon Sep 17 00:00:00 2001
From: Hannan Azam <hannan.azam@gmail.com>
Date: Thu, 21 Jan 2016 15:32:46 +0500
Subject: [PATCH] Changed the way Handlers are invoked in Export and Import

---
 .../ContentManagement/DefaultContentManager.cs  | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/Orchard/ContentManagement/DefaultContentManager.cs b/src/Orchard/ContentManagement/DefaultContentManager.cs
index c49c8104f..ec192f753 100644
--- a/src/Orchard/ContentManagement/DefaultContentManager.cs
+++ b/src/Orchard/ContentManagement/DefaultContentManager.cs
@@ -762,13 +762,9 @@ namespace Orchard.ContentManagement {
             }
 
             var context = new ImportContentContext(item, element, importContentSession);
-            foreach (var contentHandler in Handlers) {
-                contentHandler.Importing(context);
-            }
 
-            foreach (var contentHandler in Handlers) {
-                contentHandler.Imported(context);
-            }
+            Handlers.Invoke(handler => handler.Importing(context), Logger);
+            Handlers.Invoke(handler => handler.Imported(context), Logger);
 
             var savedItem = Get(item.Id, VersionOptions.Latest);
 
@@ -790,13 +786,8 @@ namespace Orchard.ContentManagement {
         public XElement Export(ContentItem contentItem) {
             var context = new ExportContentContext(contentItem, new XElement(XmlConvert.EncodeLocalName(contentItem.ContentType)));
 
-            foreach (var contentHandler in Handlers) {
-                contentHandler.Exporting(context);
-            }
-
-            foreach (var contentHandler in Handlers) {
-                contentHandler.Exported(context);
-            }
+            Handlers.Invoke(handler => handler.Exporting(context), Logger);
+            Handlers.Invoke(handler => handler.Exported(context), Logger);
 
             if (context.Exclude) {
                 return null;