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 devel

This commit is contained in:
Jan Steemann 2015-06-25 09:47:16 +02:00
parent 85c7705684 df031a9f2a
commit 83911d25f8
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arangod/Cluster/ClusterMethods.cpp
View File

@ -1282,6 +1282,7 @@ int createEdgeOnCoordinator (
// First determine the collection ID from the name: // First determine the collection ID from the name:
shared_ptr<CollectionInfo> collinfo = ci->getCollection(dbname, collname); shared_ptr<CollectionInfo> collinfo = ci->getCollection(dbname, collname);
if (collinfo->empty()) { if (collinfo->empty()) {
TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json);
return TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND; return TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND;
} }
string collid = StringUtils::itoa(collinfo->id()); string collid = StringUtils::itoa(collinfo->id());

2
arangod/RestHandler/RestEdgeHandler.cpp
View File

@ -340,7 +340,6 @@ bool RestEdgeHandler::createDocumentCoordinator (string const& collname,
if (error != TRI_ERROR_NO_ERROR) { if (error != TRI_ERROR_NO_ERROR) {
generateTransactionError(collname.c_str(), error); generateTransactionError(collname.c_str(), error);
TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json);
return false; return false;
} }
// Essentially return the response we got from the DBserver, be it // Essentially return the response we got from the DBserver, be it
@ -348,7 +347,6 @@ bool RestEdgeHandler::createDocumentCoordinator (string const& collname,
_response = createResponse(responseCode); _response = createResponse(responseCode);
triagens::arango::mergeResponseHeaders(_response, resultHeaders); triagens::arango::mergeResponseHeaders(_response, resultHeaders);
_response->body().appendText(resultBody.c_str(), resultBody.size()); _response->body().appendText(resultBody.c_str(), resultBody.size());
TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json);
return responseCode >= triagens::rest::HttpResponse::BAD; return responseCode >= triagens::rest::HttpResponse::BAD;
} }