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/triAGENS/ArangoDB into aql2

This commit is contained in:
Jan Steemann 2014-07-31 12:12:04 +02:00
parent c7c7ee5a52 fa5096a710
commit bee98cf420
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arangod/Cluster/v8-cluster.cpp
View File

@ -1515,9 +1515,12 @@ static v8::Handle<v8::Value> JS_AsyncRequest (v8::Arguments const& argv) {
// - coordTransactionID (number) // - coordTransactionID (number)
// - timeout (number) // - timeout (number)
if (ServerState::instance()->getRole() != ServerState::ROLE_COORDINATOR) { // Disabled to allow communication originating in a DBserver:
TRI_V8_EXCEPTION_INTERNAL(scope,"request works only in coordinator role"); // 31.7.2014 Max
}
// if (ServerState::instance()->getRole() != ServerState::ROLE_COORDINATOR) {
// TRI_V8_EXCEPTION_INTERNAL(scope,"request works only in coordinator role");
//}
ClusterComm* cc = ClusterComm::instance(); ClusterComm* cc = ClusterComm::instance();
@ -1572,9 +1575,12 @@ static v8::Handle<v8::Value> JS_SyncRequest (v8::Arguments const& argv) {
// - coordTransactionID (number) // - coordTransactionID (number)
// - timeout (number) // - timeout (number)
if (ServerState::instance()->getRole() != ServerState::ROLE_COORDINATOR) { // Disabled to allow communication originating in a DBserver:
TRI_V8_EXCEPTION_INTERNAL(scope,"request works only in coordinator role"); // 31.7.2014 Max
}
//if (ServerState::instance()->getRole() != ServerState::ROLE_COORDINATOR) {
// TRI_V8_EXCEPTION_INTERNAL(scope,"request works only in coordinator role");
//}
ClusterComm* cc = ClusterComm::instance(); ClusterComm* cc = ClusterComm::instance();