From 55d66ff4ae649fd32ca77f321a9f67711faa2f2e Mon Sep 17 00:00:00 2001
From: coder-zzzz <349427217@qq.com>
Date: Wed, 22 Apr 2020 15:34:07 +0800
Subject: [PATCH] fix #1957 DefaultMQProducer didn't shutdown completely

---
 .../apache/rocketmq/client/impl/factory/MQClientInstance.java   | 1 +
 .../rocketmq/client/impl/producer/DefaultMQProducerImpl.java    | 2 +-
 2 files changed, 2 insertions(+), 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
index bbd2eecb..4844da51 100644
--- 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 class MQClientInstance {
                     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
index fca50cc5..a7bd1842 100644
--- 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 class DefaultMQProducerImpl implements MQProducerInner {
                 if (shutdownFactory) {
                     this.mQClientFactory.shutdown();
                 }
-
+                this.timer.cancel();
                 log.info("the producer [{}] shutdown OK", this.defaultMQProducer.getProducerGroup());
                 this.serviceState = ServiceState.SHUTDOWN_ALREADY;
                 break;
-- 
GitLab