CPP-708 - Fix timer leak in WaitForHandler (#208)

mpenick · web-flow · commit ac2b7c508b9a · 2018-11-29T16:34:48.000-05:00
The retry timer could leak when a timed out request scheduled another attempt after the whole handler had timed out.
diff --git a/cpp-driver/src/wait_for_handler.cpp b/cpp-driver/src/wait_for_handler.cpp
@@ -99,8 +99,10 @@ void WaitForHandler::start(Connection* connection) {
 }
 
 void WaitForHandler::schedule() {
-  retry_timer_.start(connection_->loop(), retry_wait_time_ms_,
-                     bind_callback(&WaitForHandler::on_retry_timeout, this));
+  if (!is_finished_) { // Don't schedule a retry if the handler is finished.
+    retry_timer_.start(connection_->loop(), retry_wait_time_ms_,
+                       bind_callback(&WaitForHandler::on_retry_timeout, this));
+  }
 }
 
 void WaitForHandler::finish() {

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,10 @@ void WaitForHandler::start(Connection* connection) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`void WaitForHandler::schedule() {`
`102`		`- retry_timer_.start(connection_->loop(), retry_wait_time_ms_,`
`103`		`- bind_callback(&WaitForHandler::on_retry_timeout, this));`
	`102`	`+ if (!is_finished_) { // Don't schedule a retry if the handler is finished.`
	`103`	`+ retry_timer_.start(connection_->loop(), retry_wait_time_ms_,`
	`104`	`+ bind_callback(&WaitForHandler::on_retry_timeout, this));`
	`105`	`+ }`
`104`	`106`	`}`
`105`	`107`
`106`	`108`	`void WaitForHandler::finish() {`