Fix: NPE when cursor failed to close empty subscription (apache#1662)

ivankelly · Apr 27, 2018 · 8335d7c · 8335d7c
1 parent 02eff26
commit 8335d7c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...ker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java b/...ker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
@@ -542,7 +542,9 @@ public synchronized CompletableFuture<Void> disconnect() {
                     disconnectFuture.complete(null);
                 }).exceptionally(exception -> {
                     IS_FENCED_UPDATER.set(this, FALSE);
-                    dispatcher.reset();
+                    if (dispatcher != null) {
+                        dispatcher.reset();
+                    }
                     log.error("[{}][{}] Error disconnecting consumers from subscription", topicName, subName,
                             exception);
                     disconnectFuture.completeExceptionally(exception);