From c1428e81cd04665110cf79cf3bf437913c6d0fe7 Mon Sep 17 00:00:00 2001
From: Max Neunhoeffer <max@arangodb.com>
Date: Tue, 24 Jan 2017 16:47:23 +0100
Subject: [PATCH] Try to fix a shutdown bug in Scheduler.

---
 arangod/Scheduler/Scheduler.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/arangod/Scheduler/Scheduler.cpp b/arangod/Scheduler/Scheduler.cpp
index e9706bac46..7f4c8754aa 100644
--- a/arangod/Scheduler/Scheduler.cpp
+++ b/arangod/Scheduler/Scheduler.cpp
@@ -166,7 +166,12 @@ Scheduler::Scheduler(size_t nrThreads, size_t maxQueueSize)
   initializeSignalHandlers();
 }
 
-Scheduler::~Scheduler() { deleteOldThreads(); }
+Scheduler::~Scheduler() {
+  if (_threadManager != nullptr) {
+    _threadManager->cancel();
+  }
+  deleteOldThreads();
+}
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                      constructors and destructors