Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Bugfixes in error handling." 

This reverts commit ab7ab515fb, which was
nonsensical.
This commit is contained in:
Max Neunhoeffer 2016-06-03 06:26:03 -06:00
parent 91ff87157d
commit d8573bd009
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arangod/Cluster/ClusterMethods.cpp
View File

@ -785,15 +785,14 @@ int createDocumentOnCoordinator(
// Perform the requests // Perform the requests
size_t nrDone = 0; size_t nrDone = 0;
size_t nrGood = cc->performRequests(requests, CL_DEFAULT_TIMEOUT, nrDone, cc->performRequests(requests, CL_DEFAULT_TIMEOUT, nrDone, Logger::REQUESTS);
Logger::REQUESTS);
// Now listen to the results: // Now listen to the results:
if (!useMultiple) { if (!useMultiple) {
TRI_ASSERT(requests.size() == 1); TRI_ASSERT(requests.size() == 1);
auto const& req = requests[0]; auto const& req = requests[0];
auto res = req.result; auto res = req.result;
if (nrGood == 0) { if (nrDone == 0) {
// There has been Communcation error. Handle and return it. // There has been Communcation error. Handle and return it.
return handleGeneralCommErrors(&res); return handleGeneralCommErrors(&res);
} }
@ -944,15 +943,14 @@ int deleteDocumentOnCoordinator(
// Perform the requests // Perform the requests
size_t nrDone = 0; size_t nrDone = 0;
size_t nrGood = cc->performRequests(requests, CL_DEFAULT_TIMEOUT, nrDone, cc->performRequests(requests, CL_DEFAULT_TIMEOUT, nrDone, Logger::REQUESTS);
Logger::REQUESTS);
// Now listen to the results: // Now listen to the results:
if (!useMultiple) { if (!useMultiple) {
TRI_ASSERT(requests.size() == 1); TRI_ASSERT(requests.size() == 1);
auto const& req = requests[0]; auto const& req = requests[0];
auto res = req.result; auto res = req.result;
if (nrGood == 0) { if (nrDone == 0) {
return handleGeneralCommErrors(&res); return handleGeneralCommErrors(&res);
} }
responseCode = res.answer_code; responseCode = res.answer_code;