From 29170414a29a01d78d684caa0aae5883efc686f4 Mon Sep 17 00:00:00 2001
From: jsteemann <jan@arangodb.com>
Date: Thu, 1 Sep 2016 10:40:29 +0200
Subject: [PATCH] removed unused property

---
 arangod/RestServer/DatabaseFeature.cpp  | 3 ---
 arangod/RestServer/DatabaseFeature.h    | 1 -
 arangod/StorageEngine/MMFilesEngine.cpp | 2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arangod/RestServer/DatabaseFeature.cpp b/arangod/RestServer/DatabaseFeature.cpp
index 7c66118ba1..7d62690dea 100644
--- a/arangod/RestServer/DatabaseFeature.cpp
+++ b/arangod/RestServer/DatabaseFeature.cpp
@@ -228,7 +228,6 @@ DatabaseFeature::DatabaseFeature(ApplicationServer* server)
       _isInitiallyEmpty(false),
       _replicationApplier(true),
       _checkVersion(false),
-      _iterateMarkersOnOpen(false),
       _upgrade(false) {
   setOptional(false);
   requiresElevatedPrivileges(false);
@@ -309,8 +308,6 @@ void DatabaseFeature::start() {
   // init key generator
   KeyGenerator::Initialize();
 
-  _iterateMarkersOnOpen = !wal::LogfileManager::instance()->hasFoundLastTick();
-
   verifyAppPaths();
 
   // scan all databases
diff --git a/arangod/RestServer/DatabaseFeature.h b/arangod/RestServer/DatabaseFeature.h
index 36b83cd9ac..5343cfe14e 100644
--- a/arangod/RestServer/DatabaseFeature.h
+++ b/arangod/RestServer/DatabaseFeature.h
@@ -164,7 +164,6 @@ class DatabaseFeature final : public application_features::ApplicationFeature {
   bool _isInitiallyEmpty;
   bool _replicationApplier;
   bool _checkVersion;
-  bool _iterateMarkersOnOpen;
   bool _upgrade;
 
   /// @brief lock for serializing the creation of databases
diff --git a/arangod/StorageEngine/MMFilesEngine.cpp b/arangod/StorageEngine/MMFilesEngine.cpp
index 455c71209a..d9807b4037 100644
--- a/arangod/StorageEngine/MMFilesEngine.cpp
+++ b/arangod/StorageEngine/MMFilesEngine.cpp
@@ -170,6 +170,8 @@ void MMFilesEngine::start() {
     // create a database for the system database
     res = createDatabaseDirectory(TRI_NewTickServer(), TRI_VOC_SYSTEM_DATABASE);
     _iterateMarkersOnOpen = false;
+  } else {
+    _iterateMarkersOnOpen = !application_features::ApplicationServer::getFeature<wal::LogfileManager>("LogfileManager")->hasFoundLastTick();
   }
 
   if (res != TRI_ERROR_NO_ERROR) {