From add5e8968e4ad935a501bc461458b118d2a22c66 Mon Sep 17 00:00:00 2001
From: Hylke van der Schaaf <hylke.vds@gmail.com>
Date: Sat, 7 Jul 2018 13:47:35 +0200
Subject: [PATCH] Fixed executor not shutting down.

---
 broker/src/main/java/io/moquette/server/Server.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/broker/src/main/java/io/moquette/server/Server.java b/broker/src/main/java/io/moquette/server/Server.java
index 7bd00364..55b794cb 100644
--- a/broker/src/main/java/io/moquette/server/Server.java
+++ b/broker/src/main/java/io/moquette/server/Server.java
@@ -255,7 +255,9 @@ public class Server {
             }
         }
 
-        scheduler.shutdown();
+		// calling shutdown() does not actually stop tasks that are not cancelled,
+		// and SessionsRepository does not stop its tasks. Thus shutdownNow().
+        scheduler.shutdownNow();
 
         LOG.info("Moquette server has been stopped.");
     }