fix handle leak for recycler concurrent thread

leirocks · leirocks · commit 0c7fe5232e52 · 2017-06-01T16:26:45.000-07:00
diff --git a/lib/Common/Memory/Recycler.cpp b/lib/Common/Memory/Recycler.cpp
@@ -4613,7 +4613,11 @@ Recycler::FinalizeConcurrent(bool restoreState)
     }
 
     this->threadService = nullptr;
-    this->concurrentThread = nullptr;
+    if (concurrentThread != NULL)
+    {
+        CloseHandle(concurrentThread);
+        this->concurrentThread = nullptr;
+    }
 }
 
 bool
@@ -4745,10 +4749,6 @@ Recycler::ShutdownThread()
         Assert(concurrentThread != NULL || threadService->HasCallback());
 
         FinalizeConcurrent(false);
-        if (concurrentThread)
-        {
-            CloseHandle(concurrentThread);
-        }
     }
 }
 
@@ -4760,10 +4760,6 @@ Recycler::DisableConcurrent()
         Assert(concurrentThread != NULL || threadService->HasCallback());
 
         FinalizeConcurrent(true);
-        if (concurrentThread)
-        {
-            CloseHandle(concurrentThread);
-        }
         this->collectionState = CollectionStateNotCollecting;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4613,7 +4613,11 @@ Recycler::FinalizeConcurrent(bool restoreState)`
`4613`	`4613`	`}`
`4614`	`4614`
`4615`	`4615`	`this->threadService = nullptr;`
`4616`		`- this->concurrentThread = nullptr;`
	`4616`	`+ if (concurrentThread != NULL)`
	`4617`	`+ {`
	`4618`	`+ CloseHandle(concurrentThread);`
	`4619`	`+ this->concurrentThread = nullptr;`
	`4620`	`+ }`
`4617`	`4621`	`}`
`4618`	`4622`
`4619`	`4623`	`bool`
`@@ -4745,10 +4749,6 @@ Recycler::ShutdownThread()`
`4745`	`4749`	`Assert(concurrentThread != NULL \|\| threadService->HasCallback());`
`4746`	`4750`
`4747`	`4751`	`FinalizeConcurrent(false);`
`4748`		`- if (concurrentThread)`
`4749`		`- {`
`4750`		`- CloseHandle(concurrentThread);`
`4751`		`- }`
`4752`	`4752`	`}`
`4753`	`4753`	`}`
`4754`	`4754`
`@@ -4760,10 +4760,6 @@ Recycler::DisableConcurrent()`
`4760`	`4760`	`Assert(concurrentThread != NULL \|\| threadService->HasCallback());`
`4761`	`4761`
`4762`	`4762`	`FinalizeConcurrent(true);`
`4763`		`- if (concurrentThread)`
`4764`		`- {`
`4765`		`- CloseHandle(concurrentThread);`
`4766`		`- }`
`4767`	`4763`	`this->collectionState = CollectionStateNotCollecting;`
`4768`	`4764`	`}`
`4769`	`4765`	`}`