Changeset 1872 for trunk/eraser6/Eraser.Manager/Task.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/Task.cs (modified) (1 diff)

trunk/eraser6/Eraser.Manager/Task.cs

@@ -461 +461 @@
             {
             }
-            catch (IOException)
-            {
-                if (System.Runtime.InteropServices.Marshal.GetLastWin32Error() ==
-                    Win32ErrorCode.SharingViolation)
-                {
-                    //The system cannot open the file, try to force the file handle to close.
-                    if (!ManagerLibrary.Settings.ForceUnlockLockedFiles)
-                        throw;
-
-                    foreach (OpenHandle handle in OpenHandle.Items)
-                        if (handle.Path == file && handle.Close())
-                        {
-                            GetPathADSes(list, out totalSize, file);
-                            return;
-                        }
-                }
-                else
+            catch (SharingViolationException)
+            {
+                //The system cannot open the file, try to force the file handle to close.
+                if (!ManagerLibrary.Settings.ForceUnlockLockedFiles)
                     throw;
+
+                foreach (OpenHandle handle in OpenHandle.Items)
+                    if (handle.Path == file && handle.Close())
+                    {
+                        GetPathADSes(list, out totalSize, file);
+                        return;
+                    }
             }
             catch (UnauthorizedAccessException e)