Changeset 2632

Timestamp:

5/22/2012 5:21:16 AM (12 months ago)

Author:

lowjoel

Message:

When erasing a file/folder, it is possible that after the erase is complete the file or containing directory was deleted by the user or another program before it can be erased. A FileNotFoundException? or DirectoryNotFoundException? would be raised respectively, so handle that situation by logging a warning.

File:

• trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/FileSystemObjectErasureTarget.cs (modified) (1 diff)

trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/FileSystemObjectErasureTarget.cs

@@ -342 +342 @@
                     else
                         Logger.Log(S._("The file {0} is a hard link or a symbolic link thus the " +
-                            "contents of the file was not erased.", LogLevel.Notice));
+                            "contents of the file was not erased.", info.FullName), LogLevel.Notice);
                     return;
+                }
+                catch (FileNotFoundException)
+                {
+                    Logger.Log(S._("The file {0} was not securely erased because the file was " +
+                        "deleted before it could be erased.", info.FullName), LogLevel.Warning);
+                }
+                catch (DirectoryNotFoundException)
+                {
+                    Logger.Log(S._("The file {0} was not securely erased because the containing " +
+                        "directory was deleted before it could be erased.", info.FullName),
+                        LogLevel.Warning);
                 }
                 catch (SharingViolationException)