From 9c52a41afe5121440f0e725128c4cf83cc51bc3b Mon Sep 17 00:00:00 2001 From: Northram Date: Tue, 26 May 2020 08:48:54 +0200 Subject: [PATCH 1/2] updated netty to 4.1.50.Final --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b6f83855d..a966f0ee1 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ subprojects { apply plugin: 'eclipse' ext { - nettyVersion = '4.1.22.Final' + nettyVersion = '4.1.50.Final' } task packageTests(type: Jar) { From 5874e10d699ba73f91bab0df7c62ca733143a7b9 Mon Sep 17 00:00:00 2001 From: Northram Date: Tue, 26 May 2020 08:50:32 +0200 Subject: [PATCH 2/2] stopping BrokerInterceptor --- broker/src/main/java/io/moquette/broker/Server.java | 2 ++ .../main/java/io/moquette/interception/BrokerInterceptor.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/broker/src/main/java/io/moquette/broker/Server.java b/broker/src/main/java/io/moquette/broker/Server.java index a11c49c73..5e70ddda1 100644 --- a/broker/src/main/java/io/moquette/broker/Server.java +++ b/broker/src/main/java/io/moquette/broker/Server.java @@ -332,6 +332,8 @@ public void stopServer() { // and SessionsRepository does not stop its tasks. Thus shutdownNow(). scheduler.shutdownNow(); + interceptor.stop(); + if (h2Builder != null) { LOG.trace("Shutting down H2 persistence {}"); h2Builder.closeStore(); diff --git a/broker/src/main/java/io/moquette/interception/BrokerInterceptor.java b/broker/src/main/java/io/moquette/interception/BrokerInterceptor.java index 79d7cb09f..baad17502 100644 --- a/broker/src/main/java/io/moquette/interception/BrokerInterceptor.java +++ b/broker/src/main/java/io/moquette/interception/BrokerInterceptor.java @@ -77,7 +77,7 @@ public BrokerInterceptor(IConfig props, List handlers) { /** * Shutdown graciously the executor service */ - void stop() { + public void stop() { LOG.info("Shutting down interceptor thread pool..."); executor.shutdown(); try {