From 2da7a934736f0f8ff7a23593d3c004d1624197cc Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Mon, 4 Sep 2017 16:01:42 +0300
Subject: [PATCH] Destroy workers after services

The workers need to be destroyed only after services have been
to ensure that they are around in case the destruction of services
involves the closing of dcbs.
---
 server/core/gateway.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/core/gateway.cc b/server/core/gateway.cc
index c4065d7f1..b0fd95225 100644
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@@ -2139,14 +2139,14 @@ int main(int argc, char **argv)
         worker->join();
     }
 
-    Worker::finish();
-    MessageQueue::finish();
-
     /*<
      * Destroy the router and filter instances of all services.
      */
     service_destroy_instances();
 
+    Worker::finish();
+    MessageQueue::finish();
+
     /*<
      * Wait the flush thread.
      */