Commit 8cb9313e authored by Jelte Jansen's avatar Jelte Jansen

[master] Fixed some merge misses for trac494

parent 75692d6d
SUBDIRS = exceptions dns cc config datasrc python xfr bench log asiolink \
testutils nsas resolve
SUBDIRS = exceptions dns cc config datasrc python xfr bench log \
resolve asiolink testutils nsas
......@@ -561,7 +561,11 @@ public:
// same goes if we have an outstanding query (can't delete
// until that one comes back to us)
done_ = true;
resolvercallback_->success(answer_message_);
if (resume) {
resolvercallback_->success(answer_message_);
} else {
resolvercallback_->failure();
}
if (lookup_timer.cancel() != 0) {
return;
}
......@@ -593,9 +597,7 @@ public:
}
if (done_) {
resolvercallback_->success(answer_message_);
//server_->resume(result == UDPQuery::SUCCESS);
delete this;
stop(true);
}
} else if (!done_ && retries_--) {
// We timed out, but we have some retries, so send again
......@@ -603,9 +605,7 @@ public:
send();
} else {
// out of retries, give up for now
resolvercallback_->failure();
//server_->resume(false);
delete this;
stop(false);
}
}
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment