Changeset 2780 for branches/eraser6/6.0/Eraser.Util/VolumeInfo.cs

Timestamp:

7/16/2012 11:05:57 AM (10 months ago)

Author:

lowjoel

Message:

When an exception is thrown in the VolumeLock? constructor, do not execute the cleanup code since it cannot run. At the same time, make the Dispose method idempotent, as required by IDisposable.

Fixes ​https://eraser.heidi.ie/forum/viewtopic.php?f=2&t=8866

File:

• branches/eraser6/6.0/Eraser.Util/VolumeInfo.cs (modified) (2 diffs)

branches/eraser6/6.0/Eraser.Util/VolumeInfo.cs

@@ -734 +734 @@
                 GC.SuppressFinalize(this);
 
+            //If we have already run, or if we did not lock the volume in the first place
+            //do not do stream cleanup.
+            if (Stream == null)
+                return;
+
             //Flush the contents of the buffer to disk since after we unlock the volume
             //we can no longer write to the volume.
@@ -746 +751 @@
                     new Win32Exception(Marshal.GetLastWin32Error()));
             }
+
+            //Make this idempotent.
+            Stream = null;
         }