From 72e48d1fa61289bdfa1b792ea99003f0947a0439 Mon Sep 17 00:00:00 2001
From: Xiaoyu Hou <houxiaoyu@apache.org>
Date: Thu, 8 Sep 2022 00:15:24 +0800
Subject: [PATCH 1/2] Fix scheduledExecutorProvider not shutdown

---
 .../java/org/apache/pulsar/client/impl/PulsarClientImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
index c436f12978976..bba970045acac 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
@@ -892,9 +892,9 @@ private void shutdownExecutors() throws PulsarClientException {
                 }
             }
         }
-        if (createdScheduledProviders && scheduledExecutorProvider != null && !scheduledExecutorProvider.isShutdown()) {
+        if (createdScheduledProviders && !scheduledExecutorProvider.isShutdown()) {
             try {
-                externalExecutorProvider.shutdownNow();
+                scheduledExecutorProvider.shutdownNow();
             } catch (Throwable t) {
                 log.warn("Failed to shutdown scheduledExecutorProvider", t);
                 pulsarClientException = PulsarClientException.unwrap(t);

From da29c848b139802dc7b8ef2b6a1651674dd09040 Mon Sep 17 00:00:00 2001
From: Xiaoyu Hou <houxiaoyu@apache.org>
Date: Thu, 8 Sep 2022 16:18:59 +0800
Subject: [PATCH 2/2] Fix check null

---
 .../java/org/apache/pulsar/client/impl/PulsarClientImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
index bba970045acac..8ba26e0d15e29 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
@@ -892,7 +892,7 @@ private void shutdownExecutors() throws PulsarClientException {
                 }
             }
         }
-        if (createdScheduledProviders && !scheduledExecutorProvider.isShutdown()) {
+        if (createdScheduledProviders && scheduledExecutorProvider != null && !scheduledExecutorProvider.isShutdown()) {
             try {
                 scheduledExecutorProvider.shutdownNow();
             } catch (Throwable t) {