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

some cleanup

This commit is contained in:
Jan Steemann 2012-06-27 15:37:50 +02:00
parent 75bd9acfba
commit 2cfcfe4e96
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arangod/RestHandler/RestBatchHandler.cpp
View File

@ -127,21 +127,20 @@ HttpHandler::status_e RestBatchHandler::execute () {
return HANDLER_DONE; return HANDLER_DONE;
} }
/*
FILE* fp = fopen("got","w");
fwrite(request->body(), request->bodySize(), 1, fp);
fclose(fp);
*/
PB_ArangoMessage inputMessages; PB_ArangoMessage inputMessages;
bool result = inputMessages.ParseFromArray(request->body(), request->bodySize()); bool result = inputMessages.ParseFromArray(request->body(), request->bodySize());
if (!result) { if (!result) {
generateError(HttpResponse::BAD, generateError(HttpResponse::BAD,
TRI_ERROR_ARANGO_COLLECTION_PARAMETER_MISSING, // TODO FIXME TRI_ERROR_HTTP_BAD_PARAMETER,
"invalid protobuf message"); "invalid protobuf message");
return HANDLER_DONE; return HANDLER_DONE;
} }
assert(_task);
HttpServer* server = dynamic_cast<HttpServer*>(_task->getServer());
assert(server);
bool failed = false; bool failed = false;
bool hasAsync = false; bool hasAsync = false;
@ -152,7 +151,7 @@ HttpHandler::status_e RestBatchHandler::execute () {
// create a handler for each input part // create a handler for each input part
const PB_ArangoBatchMessage inputMessage = inputMessages.messages(i); const PB_ArangoBatchMessage inputMessage = inputMessages.messages(i);
HttpRequestProtobuf* request = new HttpRequestProtobuf(inputMessage); HttpRequestProtobuf* request = new HttpRequestProtobuf(inputMessage);
HttpHandler* handler = _task->getServer()->createHandler(request); HttpHandler* handler = server->createHandler(request);
if (!handler) { if (!handler) {
failed = true; failed = true;
@ -200,8 +199,6 @@ HttpHandler::status_e RestBatchHandler::execute () {
} }
else { else {
// execute handler via dispatcher // execute handler via dispatcher
HttpServer* server = dynamic_cast<HttpServer*>(_task->getServer());
Scheduler* scheduler = server->getScheduler(); Scheduler* scheduler = server->getScheduler();
Dispatcher* dispatcher = server->getDispatcher(); Dispatcher* dispatcher = server->getDispatcher();