Changeset 1134

Timestamp:

6/16/2009 5:35:55 AM (4 years ago)

Author:

lowjoel

Message:

Slightly neater exception handling

File:

• trunk/eraser6/Eraser.Manager/DirectExecutor.cs (modified) (2 diffs)

trunk/eraser6/Eraser.Manager/DirectExecutor.cs

@@ -763 +763 @@
                     EraseFileClusterTips(files[i], method);
                 }
+                catch (UnauthorizedAccessException)
+                {
+                    task.Log.LastSessionEntries.Add(new LogEntry(S._("{0} did not have its " +
+                        "cluster tips erased because you do not have the required permissions to " +
+                        "erase the file cluster tips.", files[i]), LogLevel.Error));
+                }
                 catch (IOException e)
                 {
@@ -800 +806 @@
             try
             {
-                try
-                {
-                    //Otherwise, create the stream, lengthen the file, then tell the erasure
-                    //method to erase the cluster tips.
-                    using (FileStream stream = streamInfo.Open(FileMode.Open, FileAccess.Write,
-                        FileShare.None, FileOptions.WriteThrough))
-                    {
-                        try
-                        {
-                            stream.SetLength(fileArea);
-                            stream.Seek(fileLength, SeekOrigin.Begin);
-
-                            //Erase the file
-                            method.Erase(stream, long.MaxValue, PrngManager.GetInstance(
-                                ManagerLibrary.Settings.ActivePrng), null);
-                        }
-                        finally
-                        {
-                            //Make sure the file length is restored!
-                            stream.SetLength(fileLength);
-                        }
+                //Otherwise, create the stream, lengthen the file, then tell the erasure
+                //method to erase the cluster tips.
+                using (FileStream stream = streamInfo.Open(FileMode.Open, FileAccess.Write,
+                    FileShare.None, FileOptions.WriteThrough))
+                {
+                    try
+                    {
+                        stream.SetLength(fileArea);
+                        stream.Seek(fileLength, SeekOrigin.Begin);
+
+                        //Erase the file
+                        method.Erase(stream, long.MaxValue, PrngManager.GetInstance(
+                            ManagerLibrary.Settings.ActivePrng), null);
                     }
-                }
-                finally
-                {
-                    //Reset the file times
-                    streamInfo.LastAccessTime = lastAccess;
-                    streamInfo.LastWriteTime = lastWrite;
-                    streamInfo.CreationTime = created;
-                }
-            }
-            catch (UnauthorizedAccessException)
-            {
+                    finally
+                    {
+                        //Make sure the file length is restored!
+                        stream.SetLength(fileLength);
+                    }
+                }
+            }
+            finally
+            {
+                //Reset the file times
+                streamInfo.LastAccessTime = lastAccess;
+                streamInfo.LastWriteTime = lastWrite;
+                streamInfo.CreationTime = created;
             }
         }