commit 2704f1fe0c4ad70efa88310868b66a107ed1d42b
author lipenghui <penghui@apache.org> Fri Jan 07 15:16:45 2022 +0800
committer GitHub <noreply@github.com> Fri Jan 07 15:16:45 2022 +0800
tree 364d65f30ac4e797115350fc5c492ba85ef478be
parent f6f46ec9cfb8e9afb3c709d1106c687842b728c6

Avoid repeatly set startMessageIdData to null for ConsumerImpl (#13606)

pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java

diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
index da21edd..72c191e 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
@@ -740,16 +740,17 @@
         }
 
         boolean isDurable = subscriptionMode == SubscriptionMode.Durable;
-        MessageIdData startMessageIdData = null;
-        if (isDurable) {
-            // For regular durable subscriptions, the message id from where to restart will be determined by the broker.
-            startMessageIdData = null;
-        } else if (startMessageId != null) {
-            // For non-durable we are going to restart from the next entry
+        final MessageIdData startMessageIdData;
+
+        // For regular durable subscriptions, the message id from where to restart will be determined by the broker.
+        // For non-durable we are going to restart from the next entry.
+        if (!isDurable && startMessageId != null) {
             startMessageIdData = new MessageIdData()
                     .setLedgerId(startMessageId.getLedgerId())
                     .setEntryId(startMessageId.getEntryId())
                     .setBatchIndex(startMessageId.getBatchIndex());
+        } else {
+            startMessageIdData = null;
         }
 
         SchemaInfo si = schema.getSchemaInfo();