This is an automated email from the ASF dual-hosted git repository.

penghui pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git

commit 8b4d81e57a16bb4f41cacada4ed0d911363dd621
Author: Qiang Zhao <mattisonc...@gmail.com>
AuthorDate: Sat May 7 15:35:04 2022 +0800

    [improve][client] improve logic when ACK grouping tracker checks duplicated 
message id (#15465)
    
    (cherry picked from commit f6faeecc819de880eb4a93e4bb359bebbc0bc855)
---
 .../pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git 
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java
 
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java
index a1831e13e09..f0f0cfd7548 100644
--- 
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java
+++ 
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java
@@ -118,10 +118,7 @@ public class PersistentAcknowledgmentsGroupingTracker 
implements Acknowledgments
     @Override
     public boolean isDuplicate(@NonNull MessageId messageId) {
         final MessageId messageIdOfLastAck = lastCumulativeAck.messageId;
-        if (messageIdOfLastAck == null) {
-            return false;
-        }
-        if (messageId.compareTo(messageIdOfLastAck) <= 0) {
+        if (messageIdOfLastAck != null && 
messageId.compareTo(messageIdOfLastAck) <= 0) {
             // Already included in a cumulative ack
             return true;
         } else {

Reply via email to