Changeset 1772 for branches/eraser6/CodeReview/Eraser.Manager/RemoteExecutor.cs

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

File:

• branches/eraser6/CodeReview/Eraser.Manager/RemoteExecutor.cs (modified) (4 diffs)

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);
         }