summaryrefslogtreecommitdiff
path: root/src/mongo/executor
diff options
context:
space:
mode:
authorJason Carey <jcarey@argv.me>2019-02-25 17:02:53 -0500
committerJason Carey <jcarey@argv.me>2019-02-26 13:41:10 -0500
commit4365d1c27c42ff64f815a2a4df9d6a7f94d37592 (patch)
tree67f69f60669de45278c93500599d5c3a59a10604 /src/mongo/executor
parentb0d3c0d2934a2096ba27362db22fe768b5341485 (diff)
downloadmongo-4365d1c27c42ff64f815a2a4df9d6a7f94d37592.tar.gz
SERVER-39962 Fix parameter hiding in NiTL
We hide a parameter within one of the NiTL continuations, let's not do that.
Diffstat (limited to 'src/mongo/executor')
-rw-r--r--src/mongo/executor/network_interface_tl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/executor/network_interface_tl.cpp b/src/mongo/executor/network_interface_tl.cpp
index 6c91ac6ae65..ed0dd363e2c 100644
--- a/src/mongo/executor/network_interface_tl.cpp
+++ b/src/mongo/executor/network_interface_tl.cpp
@@ -481,9 +481,9 @@ Status NetworkInterfaceTL::setAlarm(Date_t when, unique_function<void()> action)
if (nowVal < when) {
warning() << "Alarm returned early. Expected at: " << when
<< ", fired at: " << nowVal;
- const auto status = setAlarm(when, std::move(action));
- if ((!status.isOK()) && (status != ErrorCodes::ShutdownInProgress)) {
- fassertFailedWithStatus(50785, status);
+ if (const auto alarmStatus = setAlarm(when, std::move(action));
+ (!alarmStatus.isOK()) && (alarmStatus != ErrorCodes::ShutdownInProgress)) {
+ fassertFailedWithStatus(50785, alarmStatus);
}
return;