Changeset 1772

Timestamp:

2/8/2010 8:25:51 AM (2 years ago)

Author:

lowjoel

Message:

Allow all IDisposable patterns to be reentrant. Addresses #275: Code Review

Location:

branches/eraser6/CodeReview

Files:

• Eraser.Manager/DirectExecutor.cs (modified) (2 diffs)
• Eraser.Manager/ManagerLibrary.cs (modified) (1 diff)
• Eraser.Manager/Plugins.cs (modified) (2 diffs)
• Eraser.Manager/RemoteExecutor.cs (modified) (4 diffs)
• Eraser.Util/Security.cs (modified) (1 diff)
• Eraser.Util/VolumeInfo.cs (modified) (2 diffs)
• Eraser/Program.ConsoleProgram.cs (modified) (2 diffs)
• Eraser/Program.GuiProgram.cs (modified) (1 diff)
• Eraser/Settings.cs (modified) (6 diffs)

branches/eraser6/CodeReview/Eraser.Manager/DirectExecutor.cs

@@ -51 +51 @@
         protected override void Dispose(bool disposing)
         {
+            if (thread == null || schedulerInterrupt == null)
+                return;
+
             if (disposing)
             {
@@ -73 +76 @@
             }
 
+            thread = null;
+            schedulerInterrupt = null;
             base.Dispose(disposing);
         }

branches/eraser6/CodeReview/Eraser.Manager/ManagerLibrary.cs

@@ -57 +57 @@
         protected virtual void Dispose(bool disposing)
         {
+            if (SettingsManager == null)
+                return;
+
             if (disposing)
             {

branches/eraser6/CodeReview/Eraser.Manager/Plugins.cs

@@ -160 +160 @@
         protected override void Dispose(bool disposing)
         {
+            if (plugins == null)
+                return;
+
             if (disposing)
             {
@@ -168 +171 @@
                         plugin.Plugin.Dispose();
             }
+
+            plugins = null;
         }
 

branches/eraser6/CodeReview/Eraser.Manager/RemoteExecutor.cs

@@ -104 +104 @@
         protected override void Dispose(bool disposing)
         {
+            if (thread == null || serverLock == null)
+                return;
+
             if (disposing)
             {
                 //Close the polling thread that creates new server instances
                 thread.Abort();
+                thread.Join();
 
                 //Close all waiting streams
@@ -121 +125 @@
             }
 
+            thread = null;
+            serverLock = null;
             base.Dispose(disposing);
         }
@@ -315 +321 @@
         protected override void Dispose(bool disposing)
         {
+            if (client == null)
+                return;
+
             if (disposing)
             {
@@ -320 +329 @@
             }
 
+            client = null;
             base.Dispose(disposing);
         }

branches/eraser6/CodeReview/Eraser.Util/Security.cs

@@ -148 +148 @@
         private void Dispose(bool disposing)
         {
+            //If we already have run Dispose, then handle will be null.
+            if (handle == null)
+                return;
+
             if (disposing)
                 handle.Close();
+
+            //Don't run Dispose again.
+            handle = null;
         }
 

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

@@ -747 +747 @@
         private void Dispose(bool disposing)
         {
+            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.
@@ -758 +761 @@
                 throw new IOException("Could not unlock volume.");
             }
+
+            //Set the stream to null so that we won't run this function again.
+            Stream = null;
         }
 

branches/eraser6/CodeReview/Eraser/Program.ConsoleProgram.cs

@@ -74 +74 @@
             protected virtual void Dispose(bool disposing)
             {
+                if (ConsoleWindow == null)
+                    return;
+
                 //Flush the buffered output to the console
                 Console.Out.Flush();
@@ -87 +90 @@
                         ConsoleWindow.Dispose();
                 }
+
+                ConsoleWindow = null;
             }
             #endregion

branches/eraser6/CodeReview/Eraser/Program.GuiProgram.cs

@@ -72 +72 @@
             protected virtual void Dispose(bool disposing)
             {
+                if (GlobalMutex == null)
+                    return;
+
                 if (disposing)
                     GlobalMutex.Close();
+                GlobalMutex = null;
             }
 

branches/eraser6/CodeReview/Eraser/Settings.cs

@@ -49 +49 @@
             public RegistrySettings(Guid pluginId, RegistryKey key)
             {
-                this.pluginID = pluginId;
-                this.key = key;
+                this.PluginID = pluginId;
+                this.Key = key;
             }
 
@@ -68 +68 @@
             private void Dispose(bool disposing)
             {
+                if (Key == null)
+                    return;
+
                 if (disposing)
-                    key.Close();
+                    Key.Close();
+                Key = null;
             }
 
@@ -79 +83 @@
                 {
                     //Get the raw registry value
-                    object rawResult = key.GetValue(setting, null);
+                    object rawResult = Key.GetValue(setting, null);
 
                     //Check if it is a serialised object
@@ -92 +96 @@
                             catch (SerializationException)
                             {
-                                key.DeleteValue(setting);
+                                Key.DeleteValue(setting);
                                 MessageBox.Show(S._("Could not load the setting {0}\\{1} for " +
-                                        "plugin {2}. The setting has been lost.", key, setting,
-                                        pluginID.ToString()),
+                                        "plugin {2}. The setting has been lost.", Key, setting,
+                                        PluginID.ToString()),
                                     S._("Eraser"), MessageBoxButtons.OK, MessageBoxIcon.Error,
                                     MessageBoxDefaultButton.Button1,
@@ -113 +117 @@
                     if (value == null)
                     {
-                        key.DeleteValue(setting);
+                        Key.DeleteValue(setting);
                     }
                     else
                     {
                         if (value is bool)
-                            key.SetValue(setting, value, RegistryValueKind.DWord);
+                            Key.SetValue(setting, value, RegistryValueKind.DWord);
                         else if ((value is int) || (value is uint))
-                            key.SetValue(setting, value, RegistryValueKind.DWord);
+                            Key.SetValue(setting, value, RegistryValueKind.DWord);
                         else if ((value is long) || (value is ulong))
-                            key.SetValue(setting, value, RegistryValueKind.QWord);
+                            Key.SetValue(setting, value, RegistryValueKind.QWord);
                         else if (value is string)
-                            key.SetValue(setting, value, RegistryValueKind.String);
+                            Key.SetValue(setting, value, RegistryValueKind.String);
                         else
                             using (MemoryStream stream = new MemoryStream())
                             {
                                 new BinaryFormatter().Serialize(stream, value);
-                                key.SetValue(setting, stream.ToArray(), RegistryValueKind.Binary);
+                                Key.SetValue(setting, stream.ToArray(), RegistryValueKind.Binary);
                             }
                     }
@@ -138 +142 @@
             /// The GUID of the plugin whose settings this object is storing.
             /// </summary>
-            private Guid pluginID;
+            private Guid PluginID;
 
             /// <summary>
             /// The registry key where the data is stored.
             /// </summary>
-            private RegistryKey key;
+            private RegistryKey Key;
         }