You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2022/06/07 05:04:47 UTC
[pulsar] 17/17: Fix cherry-pick issue
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 d50201d418354743e67cc33c1a9e6c44e1f250cc
Author: penghui <pe...@apache.org>
AuthorDate: Tue Jun 7 13:03:22 2022 +0800
Fix cherry-pick issue
---
.../org/apache/pulsar/broker/service/MessageCumulativeAckTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageCumulativeAckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageCumulativeAckTest.java
index 86754efc0c2..2b67a58e43d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageCumulativeAckTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageCumulativeAckTest.java
@@ -155,7 +155,7 @@ public class MessageCumulativeAckTest {
public void testAckWithIndividualAckMode(CommandSubscribe.SubType subType) throws Exception {
Consumer consumer = new Consumer(sub, subType, "topic-1", consumerId, 0,
"Cons1", true, serverCnx, "myrole-1", emptyMap(), false, null,
- MessageId.latest, DEFAULT_CONSUMER_EPOCH);
+ null, MessageId.latest, DEFAULT_CONSUMER_EPOCH);
CommandAck commandAck = new CommandAck();
commandAck.setAckType(Cumulative);
@@ -170,7 +170,7 @@ public class MessageCumulativeAckTest {
public void testAckWithNotIndividualAckMode(CommandSubscribe.SubType subType) throws Exception {
Consumer consumer = new Consumer(sub, subType, "topic-1", consumerId, 0,
"Cons1", true, serverCnx, "myrole-1", emptyMap(), false, null,
- MessageId.latest, DEFAULT_CONSUMER_EPOCH);
+ null, MessageId.latest, DEFAULT_CONSUMER_EPOCH);
CommandAck commandAck = new CommandAck();
commandAck.setAckType(Cumulative);
@@ -185,7 +185,7 @@ public class MessageCumulativeAckTest {
public void testAckWithMoreThanNoneMessageIds() throws Exception {
Consumer consumer = new Consumer(sub, Failover, "topic-1", consumerId, 0,
"Cons1", true, serverCnx, "myrole-1", emptyMap(), false, null,
- MessageId.latest, DEFAULT_CONSUMER_EPOCH);
+ null, MessageId.latest, DEFAULT_CONSUMER_EPOCH);
CommandAck commandAck = new CommandAck();
commandAck.setAckType(Cumulative);