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

Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk

This commit is contained in:
jsteemann 2016-03-23 23:48:27 +01:00
parent 3f3ac72503 8f4a3be165
commit 1efc83babf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/RestHandler/RestAgencyHandler.cpp
View File

@ -1,4 +1,3 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// DISCLAIMER /// DISCLAIMER
/// ///
@ -90,8 +89,8 @@ inline HttpHandler::status_t RestAgencyHandler::handleWrite () {
return HttpHandler::status_t(HANDLER_DONE); return HttpHandler::status_t(HANDLER_DONE);
} }
write_ret_t ret = _agent->write (query); write_ret_t ret = _agent->write (query);
size_t errors = 0;
if (ret.accepted) { // We're leading and handling the request if (ret.accepted) { // We're leading and handling the request
size_t errors = 0;
Builder body; Builder body;
body.add(VPackValue(VPackValueType::Object)); body.add(VPackValue(VPackValueType::Object));
_agent->waitFor (ret.indices.back()); // Wait for confirmation _agent->waitFor (ret.indices.back()); // Wait for confirmation

1
arangod/RestServer/ArangoServer.cpp
View File

@ -379,6 +379,7 @@ ArangoServer::ArangoServer(int argc, char** argv)
_applicationDispatcher(nullptr), _applicationDispatcher(nullptr),
_applicationEndpointServer(nullptr), _applicationEndpointServer(nullptr),
_applicationCluster(nullptr), _applicationCluster(nullptr),
_applicationAgency(nullptr),
_jobManager(nullptr), _jobManager(nullptr),
_applicationV8(nullptr), _applicationV8(nullptr),
_authenticateSystemOnly(false), _authenticateSystemOnly(false),