From 96d96ca9776381cd1c3efda1054d082478a76949 Mon Sep 17 00:00:00 2001
From: jsteemann <jan@arangodb.com>
Date: Wed, 13 Apr 2016 12:20:24 +0200
Subject: [PATCH] always load agency data, regardless of startup mode

---
 arangod/RestServer/ArangoServer.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/arangod/RestServer/ArangoServer.cpp b/arangod/RestServer/ArangoServer.cpp
index 55f96023bb..728b0e4374 100644
--- a/arangod/RestServer/ArangoServer.cpp
+++ b/arangod/RestServer/ArangoServer.cpp
@@ -1662,6 +1662,11 @@ int ArangoServer::startupServer() {
       FATAL_ERROR_EXIT();
     }
   }
+  
+  // Loading ageny's persistent state
+  if(_applicationAgency->agent() != nullptr) {
+    _applicationAgency->agent()->load();
+  }
 
   if (_disableAuthentication) {
     LOG(INFO) << "Authentication is turned off";
@@ -1815,15 +1820,12 @@ void ArangoServer::waitForHeartbeat() {
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief runs the server
 ////////////////////////////////////////////////////////////////////////////////
+
 int ArangoServer::runServer(TRI_vocbase_t* vocbase) {
-  // disabled maintenance mode
+  // disable maintenance mode
   waitForHeartbeat();
   HttpHandlerFactory::setMaintenance(false);
 
-  // Loading ageny's persistent state
-  if(_applicationAgency->agent()!=nullptr)
-    _applicationAgency->agent()->load();
-
   // just wait until we are signalled
   _applicationServer->wait();