From 103b19f22fd036266c3792aee8f4544d53c26657 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Fri, 5 Aug 2016 17:45:20 +0200 Subject: [PATCH] fix confusion with local and cluster databases --- arangod/V8Server/v8-vocbase.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arangod/V8Server/v8-vocbase.cpp b/arangod/V8Server/v8-vocbase.cpp index 22de96c643..5e1fccc70b 100644 --- a/arangod/V8Server/v8-vocbase.cpp +++ b/arangod/V8Server/v8-vocbase.cpp @@ -2038,12 +2038,7 @@ static void JS_UseDatabase(v8::FunctionCallbackInfo const& args) { if (TRI_IsDeletedVocBase(vocbase)) { TRI_V8_THROW_EXCEPTION(TRI_ERROR_ARANGO_DATABASE_NOT_FOUND); } - - if (TRI_EqualString(name.c_str(), vocbase->_name)) { - // same database. nothing to do - TRI_V8_RETURN(WrapVocBase(isolate, vocbase)); - } - + if (ServerState::instance()->isCoordinator()) { vocbase = TRI_UseCoordinatorDatabaseServer( static_cast(v8g->_server), name.c_str()); @@ -2062,7 +2057,6 @@ static void JS_UseDatabase(v8::FunctionCallbackInfo const& args) { TRI_ASSERT(orig != nullptr); v8g->_vocbase = vocbase; - TRI_ASSERT(orig != vocbase); TRI_ReleaseDatabaseServer(static_cast(v8g->_server), static_cast(orig));