Added logging for invalid recipe files

src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs

@@ -136,8 +136,8 @@ namespace Orchard.Tests.Modules.Recipes.Services {
         }
 
         [Test]
-        public void ParseRecipeThrowsOnInvalidXml() {
+        public void ParseRecipeReturnsNullOnInvalidXml() {
-            Assert.Throws(typeof(XmlException), () => _recipeParser.ParseRecipe("<reipe></recipe>"));
+            Assert.That(_recipeParser.ParseRecipe("<reipe></recipe>") == null);
         }
 
         [Test]

src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs

@@ -133,6 +133,7 @@ namespace Orchard.Modules.Controllers {
                     Module = x,
                     Recipes = _recipeHarvester.HarvestRecipes(x.Descriptor.Id).Where(recipe => !recipe.IsSetupRecipe).ToList()
                 })
+                .ToList()
                 .Where(x => x.Recipes.Any());
             }
 

src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeHarvester.cs

@@ -35,10 +35,20 @@ namespace Orchard.Recipes.Services {
             if (extension != null) {
                 var recipeLocation = Path.Combine(extension.Location, extensionId, "Recipes");
                 var recipeFiles = _webSiteFolder.ListFiles(recipeLocation, true);
-                recipes.AddRange(
+
-                    from recipeFile in recipeFiles
+                recipeFiles.Where(r => r.EndsWith(".recipe.xml", StringComparison.OrdinalIgnoreCase)).ToList().ForEach(r =>
-                    where recipeFile.EndsWith(".recipe.xml", StringComparison.OrdinalIgnoreCase)
+                {
-                    select _recipeParser.ParseRecipe(_webSiteFolder.ReadFile(recipeFile)));
+                    var recipe = _recipeParser.ParseRecipe(_webSiteFolder.ReadFile(r));
+
+                    if (recipe == null)
+                    {
+                        Logger.Error(new Exception(string.Format("Invalid recipe file: {0}", r)), "Invalid recipe file: {0}", r);
+                    }
+                    else
+                    {
+                        recipes.Add(recipe);
+                    }
+                });
             }
             else {
                 Logger.Error("Could not discover recipes because module '{0}' was not found.", extensionId);

src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeParser.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Xml;
 using System.Xml.Linq;
 using Orchard.Localization;
@@ -21,10 +20,23 @@ namespace Orchard.Recipes.Services {
             var recipe = new Recipe();
             
             try {
+                if (string.IsNullOrEmpty(recipeText))
+                {
+                    return null;
+                }
+
+                XElement recipeTree;
+
+                try
+                {
+                    recipeTree = XElement.Parse(recipeText, LoadOptions.PreserveWhitespace);
+                }
+                catch
+                {
+                    return null;
+                }
+
                 var recipeSteps = new List<RecipeStep>();
-                TextReader textReader = new StringReader(recipeText);
-                var recipeTree = XElement.Load(textReader, LoadOptions.PreserveWhitespace);
-                textReader.Close();
 
                 foreach (var element in recipeTree.Elements()) {
                     // Recipe mETaDaTA