check for serverless mode

fceller · fceller · commit f2d9ae02860b · 2016-03-17T12:00:27.000+01:00
diff --git a/arangosh/Shell/V8ShellFeature.cpp b/arangosh/Shell/V8ShellFeature.cpp
@@ -138,8 +138,8 @@ void V8ShellFeature::stop() {
     v8::Locker locker{_isolate};
     v8::Isolate::Scope isolate_scope{_isolate};
 
-    TRI_v8_global_t* v8g =                                              \
-      static_cast<TRI_v8_global_t*>(_isolate->GetData(V8DataSlot));
+    TRI_v8_global_t* v8g =
+        static_cast<TRI_v8_global_t*>(_isolate->GetData(V8DataSlot));
     _isolate->SetData(V8DataSlot, nullptr);
 
     delete v8g;
@@ -246,8 +246,7 @@ V8ClientConnection* V8ShellFeature::setup(
       v8connection = std::make_unique<V8ClientConnection>(
           connection, client->databaseName(), client->username(),
           client->password(), client->requestTimeout());
-    }
-    else {
+    } else {
       client = nullptr;
     }
   }
@@ -285,8 +284,10 @@ int V8ShellFeature::runShell(std::vector<std::string> const& positionals) {
 
   V8LineEditor v8LineEditor(_isolate, context, "." + _name + ".history");
 
-  v8LineEditor.setSignalFunction(
-      [&v8connection]() { v8connection->setInterrupted(true); });
+  if (v8connection != nullptr) {
+    v8LineEditor.setSignalFunction(
+        [&v8connection]() { v8connection->setInterrupted(true); });
+  }
 
   v8LineEditor.open(_console->autoComplete());
 
@@ -372,7 +373,9 @@ int V8ShellFeature::runShell(std::vector<std::string> const& positionals) {
       promptError = true;
     }
 
-    v8connection->setInterrupted(false);
+    if (v8connection != nullptr) {
+      v8connection->setInterrupted(false);
+    }
 
     _console->stopPager();
     _console->printLine("");
@@ -566,7 +569,7 @@ bool V8ShellFeature::jslint(std::vector<std::string> const& files) {
   TRI_ExecuteJavaScriptString(_isolate, context, input, name, true);
 
   if (tryCatch.HasCaught()) {
-      LOG(ERR) << TRI_StringifyV8Exception(_isolate, &tryCatch);
+    LOG(ERR) << TRI_StringifyV8Exception(_isolate, &tryCatch);
     ok = false;
   } else {
     bool res = TRI_ObjectToBoolean(context->Global()->Get(
@@ -855,8 +858,7 @@ void V8ShellFeature::initMode(ShellFeature::RunMode runMode,
 
   TRI_AddGlobalVariableVocbase(
       _isolate, context, TRI_V8_ASCII_STRING2(_isolate, "IS_UNIT_TESTS"),
-      v8::Boolean::New(_isolate,
-                       runMode == ShellFeature::RunMode::UNIT_TESTS));
+      v8::Boolean::New(_isolate, runMode == ShellFeature::RunMode::UNIT_TESTS));
 
   TRI_AddGlobalVariableVocbase(
       _isolate, context, TRI_V8_ASCII_STRING2(_isolate, "IS_JS_LINT"),
