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

Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

This commit is contained in:
Michael Hackstein 2013-04-16 11:12:15 +02:00
parent dff9582978 8bd5503c4c
commit 5557dbc729
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -1,6 +1,8 @@
v1.3.0-alpha1 (XXXX-XX-XX) v1.3.0-alpha1 (XXXX-XX-XX)
-------------------------- --------------------------
* issue #475: A better error message for deleting a non-existent graph
* issue #474: Web interface problems with the JS Shell * issue #474: Web interface problems with the JS Shell
* added missing documentation for AQL UNION function * added missing documentation for AQL UNION function

1
arangod/VocBase/compactor.c
View File

@ -395,7 +395,6 @@ static bool Compactifier (TRI_df_marker_t const* marker,
found2 = CONST_CAST(found); found2 = CONST_CAST(found);
// the fid won't change // the fid won't change
TRI_ASSERT_MAINTAINER(found2->_fid == context->_dfi._fid);
// let marker point to the new position // let marker point to the new position
found2->_data = result; found2->_data = result;

4
js/actions/api-graph.js
View File

@ -370,9 +370,13 @@ function get_graph_graph (req, res) {
function delete_graph_graph (req, res) { function delete_graph_graph (req, res) {
try { try {
var g = graph_by_request(req); var g = graph_by_request(req);
if (g === null || g === undefined) {
throw "graph not found";
}
} }
catch (err) { catch (err) {
actions.resultNotFound(req, res, actions.ERROR_GRAPH_INVALID_GRAPH, err); actions.resultNotFound(req, res, actions.ERROR_GRAPH_INVALID_GRAPH, err);
return;
} }
if (matchError(req, res, g._properties, actions.ERROR_GRAPH_INVALID_GRAPH)) { if (matchError(req, res, g._properties, actions.ERROR_GRAPH_INVALID_GRAPH)) {