Fixed bug, thanks @Greooo (#244 (comment))

Antaris · Jan 20, 2016 · 197fde4 · 197fde4
1 parent 2462778
commit 197fde4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/buildConfig.fsx b/buildConfig.fsx
@@ -36,7 +36,7 @@ let projectDescription_roslyn = "RazorEngine.Roslyn - Roslyn support for RazorEn
 // !!!!!!!!!!!!!!!!!!!
 // UPDATE RELEASE NOTES AS WELL!
 // !!!!!!!!!!!!!!!!!!!
-let version_razor4 = "4.2.6-beta1"
+let version_razor4 = "4.2.7-beta1"
 let version_roslyn = "3.5.5-beta1"
 let version_roslyn_razor4 = "4.0.5-beta1"
 

diff --git a/doc/ReleaseNotes.md b/doc/ReleaseNotes.md
@@ -1,4 +1,8 @@
-### 3.7.6 / 4.2.6-beta1
+### 3.7.7 / 4.2.7-beta1
+
+ * Fixed bug, thanks @Greooo (https://github.com/Antaris/RazorEngine/issues/244#issuecomment-173322177)
+
+### 3.7.6 / 4.2.6-beta1
 
  * Fix https://github.com/Antaris/RazorEngine/pull/348
 

diff --git a/src/source/RazorEngine.Core/Compilation/CrossAppDomainCleanUp.cs b/src/source/RazorEngine.Core/Compilation/CrossAppDomainCleanUp.cs
@@ -262,8 +262,10 @@ private bool DoCleanUp()
             {
                 bool success = true;
                 string item;
+                var failedFiles = new Queue<string>();
                 while (_toCleanup.TryDequeue(out item))
                 {
+                    Exception error = null;
                     if (File.Exists(item))
                     {
                         try
@@ -272,13 +274,11 @@ private bool DoCleanUp()
                         }
                         catch (IOException exn)
                         {
-                            success = false;
-                            _printer.PrintError("Could not delete {0}: {1}", item, exn.ToString());
+                            error = exn;
                         }
                         catch (UnauthorizedAccessException exn)
                         {
-                            success = false;
-                            _printer.PrintError("Could not delete {0}: {1}", item, exn.ToString());
+                            error = exn;
                         }
                     }
                     if (Directory.Exists(item))
@@ -289,16 +289,27 @@ private bool DoCleanUp()
                         }
                         catch (IOException exn)
                         {
-                            success = false;
-                            _printer.PrintError("Could not delete {0}: {1}", item, exn.ToString());
+                            error = exn;
                         }
                         catch (UnauthorizedAccessException exn)
                         {
-                            success = false;
-                            _printer.PrintError("Could not delete {0}: {1}", item, exn.ToString());
+                            error = exn;
                         }
                     }
+
+                    if (error != null)
+                    {
+                        success = false;
+                        failedFiles.Enqueue(item);
+                        _printer.PrintError("Could not delete {0}: {1}", item, error.ToString());
+                    }
                 }
+
+                while (failedFiles.Count > 0)
+                {
+                    _toCleanup.Enqueue(failedFiles.Dequeue());
+                }
+
                 return success;
             }