This is an automated email from the ASF dual-hosted git repository. penghui pushed a commit to branch branch-2.8 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit d91c6d1b33d11351593a08f93e1bcb4336679fdb Author: Qiang Zhao <[email protected]> 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 e3d41231dd9..9ba965d37cc 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 @@ -117,10 +117,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 {
