Changeset 1872 for trunk/eraser6/Eraser.Manager/DirectExecutor.cs

Timestamp:

3/1/2010 9:36:02 AM (2 years ago)

Author:

lowjoel

Message:

Define a discrete SharingViolationException? which is thrown when a file is currently in use. This makes handling such errors easier.

File:

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

trunk/eraser6/Eraser.Manager/DirectExecutor.cs

@@ -309 +309 @@
                         throw;
                     }
+                    catch (SharingViolationException)
+                    {
+                    }
                     catch (ThreadAbortException)
                     {
@@ -331 +334 @@
                 //is executed. This is here mainly to ensure that no BlackBox
                 //report is created for this exception.
+            }
+            catch (SharingViolationException)
+            {
             }
             catch (Exception e)
@@ -674 +680 @@
                         "permissions prevent access to the file.", info.FullName), LogLevel.Error);
                 }
-                catch (IOException)
-                {
-                    if (System.Runtime.InteropServices.Marshal.GetLastWin32Error() ==
-                        Win32ErrorCode.SharingViolation)
-                    {
-                        if (!ManagerLibrary.Settings.ForceUnlockLockedFiles)
-                            throw;
-
-                        List<System.Diagnostics.Process> processes =
-                            new List<System.Diagnostics.Process>();
-                        foreach (OpenHandle handle in OpenHandle.Items)
-                            if (handle.Path == paths[i])
-                                processes.Add(System.Diagnostics.Process.GetProcessById(handle.ProcessId));
-
-                        string lockedBy = null;
-                        if (processes.Count > 0)
+                catch (SharingViolationException)
+                {
+                    if (!ManagerLibrary.Settings.ForceUnlockLockedFiles)
+                        throw;
+
+                    List<System.Diagnostics.Process> processes =
+                        new List<System.Diagnostics.Process>();
+                    foreach (OpenHandle handle in OpenHandle.Items)
+                        if (handle.Path == paths[i])
+                            processes.Add(System.Diagnostics.Process.GetProcessById(handle.ProcessId));
+
+                    string lockedBy = null;
+                    if (processes.Count > 0)
+                    {
+                        StringBuilder processStr = new StringBuilder();
+                        foreach (System.Diagnostics.Process process in processes)
                         {
-                            StringBuilder processStr = new StringBuilder();
-                            foreach (System.Diagnostics.Process process in processes)
+                            try
                             {
-                                try
-                                {
-                                    processStr.AppendFormat(System.Globalization.CultureInfo.InvariantCulture,
-                                        "{0}, ", process.MainModule.FileName);
-                                }
-                                catch (System.ComponentModel.Win32Exception)
-                                {
-                                }
+                                processStr.AppendFormat(System.Globalization.CultureInfo.InvariantCulture,
+                                    "{0}, ", process.MainModule.FileName);
                             }
-
-                            lockedBy = S._("(locked by {0})", processStr.ToString().Remove(processStr.Length - 2));
+                            catch (System.ComponentModel.Win32Exception)
+                            {
+                            }
                         }
 
-                        Logger.Log(S._("Could not force closure of file \"{0}\" {1}", paths[i],
-                            lockedBy == null ? string.Empty : lockedBy).Trim(), LogLevel.Error);
-                    }
-                    else
-                        throw;
+                        lockedBy = S._("(locked by {0})", processStr.ToString().Remove(processStr.Length - 2));
+                    }
+
+                    Logger.Log(S._("Could not force closure of file \"{0}\" {1}", paths[i],
+                        lockedBy == null ? string.Empty : lockedBy).Trim(), LogLevel.Error);
                 }
                 finally