Changeset 1888 for trunk/eraser6/Eraser.DefaultPlugins/FileSystems/Windows.cs

Timestamp:

3/14/2010 11:46:42 AM (2 years ago)

Author:

lowjoel

Message:

Forward port from Eraser 6.0: Fixed potential double exception when resetting the file attributes of the file when erasing cluster tips: When resetting the attributes back to the original, a second IOException may be thrown if we caught one when setting it to Normal (prior to erasure)

Location:

trunk/eraser6

Files:

• . (modified) (1 prop)
• Eraser.DefaultPlugins/FileSystems/Windows.cs (modified) (2 diffs)

trunk/eraser6/Eraser.DefaultPlugins/FileSystems/Windows.cs

@@ -222 +222 @@
                     continue;
 
-                FileAttributes fileAttr = streamInfo.Attributes;
-
                 try
                 {
                     //Reset the file attributes.
+                    FileAttributes fileAttr = streamInfo.Attributes;
                     streamInfo.Attributes = FileAttributes.Normal;
-                    EraseFileClusterTips(files[i], method);
+
+                    try
+                    {
+                        EraseFileClusterTips(files[i], method);
+                    }
+                    finally
+                    {
+                        streamInfo.Attributes = fileAttr;
+                    }
                 }
                 catch (UnauthorizedAccessException)
@@ -240 +247 @@
                     Logger.Log(S._("{0} did not have its cluster tips erased. The error returned " +
                         "was: {1}", files[i], e.Message), LogLevel.Error);
-                }
-                finally
-                {
-                    streamInfo.Attributes = fileAttr;
                 }