fix alibaba#1957

DefaultMQProducer didn't shutdown completely
CST11021 · Apr 22, 2020 · 55d66ff · 55d66ff
1 parent d1b4e47
commit 55d66ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java b/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
@@ -853,6 +853,7 @@ public void shutdown() {
                     this.scheduledExecutorService.shutdown();
                     this.mQClientAPIImpl.shutdown();
                     this.rebalanceService.shutdown();
+                    this.defaultMQProducer.shutdown();
 
                     if (this.datagramSocket != null) {
                         this.datagramSocket.close();

diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
@@ -258,7 +258,7 @@ public void shutdown(final boolean shutdownFactory) {
                 if (shutdownFactory) {
                     this.mQClientFactory.shutdown();
                 }
-
+                this.timer.cancel();
                 log.info("the producer [{}] shutdown OK", this.defaultMQProducer.getProducerGroup());
                 this.serviceState = ServiceState.SHUTDOWN_ALREADY;
                 break;