summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Nelson <lamont.nelson@mongodb.com>2020-02-25 18:03:41 -0500
committerLamont Nelson <lamont.nelson@mongodb.com>2020-02-25 18:03:41 -0500
commit3b4d8f8933e773776abeb5bfb92e2d720d156744 (patch)
treee4ee3f2389ed5e918fedc6758c3a61d2df339c2a
parent28debf8832d7d6a8924bd4586ddede94e005013b (diff)
downloadmongo-3b4d8f8933e773776abeb5bfb92e2d720d156744.tar.gz
change order of cancels
-rw-r--r--src/mongo/client/server_is_master_monitor.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/client/server_is_master_monitor.cpp b/src/mongo/client/server_is_master_monitor.cpp
index 9a960722651..6f68553ed79 100644
--- a/src/mongo/client/server_is_master_monitor.cpp
+++ b/src/mongo/client/server_is_master_monitor.cpp
@@ -214,14 +214,14 @@ void SingleServerIsMasterMonitor::shutdown() {
}
void SingleServerIsMasterMonitor::_cancelOutstandingRequest(WithLock) {
- if (_nextIsMasterHandle) {
- _executor->cancel(_nextIsMasterHandle);
- }
-
if (_remoteCommandHandle) {
_executor->cancel(_remoteCommandHandle);
}
+ if (_nextIsMasterHandle) {
+ _executor->cancel(_nextIsMasterHandle);
+ }
+
_isMasterOutstanding = false;
}