From ba05e73d55c2e346a92525f1a209b4b56f1d4fc9 Mon Sep 17 00:00:00 2001
From: rajan <rdhabalia@apache.org>
Date: Wed, 28 Apr 2021 17:23:35 -0700
Subject: [PATCH] [pulsar-broker] Handle NPE in unblock stuck subscrption task
 when dispatcher is not created

---
 .../broker/service/persistent/PersistentSubscription.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
index ece65bcdbc3ce..992d3c36f1a1d 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
@@ -1098,7 +1098,7 @@ public boolean checkIsCanDeleteConsumerPendingAck(PositionImpl position) {
     }
 
     public boolean checkAndUnblockIfStuck() {
-        return dispatcher.checkAndUnblockIfStuck();
+        return dispatcher != null ? dispatcher.checkAndUnblockIfStuck() : false;
     }
 
     private static final Logger log = LoggerFactory.getLogger(PersistentSubscription.class);