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 engine-api

This commit is contained in:
jsteemann 2017-03-31 10:34:50 +02:00
parent 30311ee578 77cddde70b
commit c92ec139a7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/RestHandler/RestImportHandler.cpp
View File

@ -476,9 +476,9 @@ bool RestImportHandler::createFromJson(std::string const& type) {
VPackSlice documents; VPackSlice documents;
try { try {
documents = _request->payload(); documents = _request->payload();
} catch (VPackException const&) { } catch (VPackException const& ex) {
generateError(rest::ResponseCode::BAD, TRI_ERROR_HTTP_BAD_PARAMETER, generateError(rest::ResponseCode::BAD, TRI_ERROR_HTTP_BAD_PARAMETER,
"expecting a JSON array in the request"); std::string("expecting a valid JSON array in the request. got: ") + ex.what());
return false; return false;
} }