(pulsar) branch branch-3.0 updated: [fix] [ci] [branch-3.0] Fix the build issue from cherry-pick (#22042)

[lhotari]

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

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


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new 890be166069 [fix] [ci] [branch-3.0] Fix the build issue from 
cherry-pick (#22042)
890be166069 is described below

commit 890be166069467d43a708475fef8ba3719cde847
Author: Penghui Li <peng...@apache.org>
AuthorDate: Thu Feb 8 23:47:59 2024 +0800

    [fix] [ci] [branch-3.0] Fix the build issue from cherry-pick (#22042)
---
 .../java/org/apache/pulsar/broker/service/OneWayReplicatorTest.java   | 1 -
 .../src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java     | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorTest.java
index 61105ebbac5..e76fd823a4b 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorTest.java
@@ -37,7 +37,6 @@ import org.apache.pulsar.common.policies.data.TopicStats;
 import org.junit.Assert;
 import org.awaitility.Awaitility;
 import org.mockito.Mockito;
-import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
diff --git 
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java 
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java
index e933005f2d6..fec428824c2 100644
--- 
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java
+++ 
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java
@@ -193,6 +193,10 @@ public abstract class ConsumerBase<T> extends HandlerState 
implements Consumer<T
         initReceiverQueueSize();
     }
 
+    protected UnAckedMessageTracker getUnAckedMessageTracker() {
+        return unAckedMessageTracker;
+    }
+
     protected void triggerBatchReceiveTimeoutTask() {
         if (!hasBatchReceiveTimeout() && batchReceivePolicy.getTimeoutMs() > 
0) {
             batchReceiveTimeout = 
client.timer().newTimeout(this::pendingBatchReceiveTask,