[pulsar] branch master updated: [fix][broker] Fix broken build caused by conflict between #17195 and #16605 (#17300)

[lh...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new ba9c01fbc78 [fix][broker] Fix broken build caused by conflict between #17195 and #16605 (#17300)
ba9c01fbc78 is described below

commit ba9c01fbc78782d2e9a303dddc17450e74e41e7c
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Fri Aug 26 20:07:02 2022 +0300

    [fix][broker] Fix broken build caused by conflict between #17195 and #16605 (#17300)
    
    - #17195 changed the method signature that #16605 depended upon
---
 .../java/org/apache/pulsar/client/impl/BatchMessageContainerImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerImpl.java
index a5e77a5bcdd..41ba4168d0f 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerImpl.java
@@ -220,7 +220,7 @@ class BatchMessageContainerImpl extends AbstractBatchMessageContainer {
             messageMetadata.copyFrom(messages.get(0).getMessageBuilder());
             ByteBuf encryptedPayload = producer.encryptMessage(messageMetadata, getCompressedBatchMetadataAndPayload());
             ByteBufPair cmd = producer.sendMessage(producer.producerId, messageMetadata.getSequenceId(),
-                1, messageMetadata, encryptedPayload);
+                1, null, messageMetadata, encryptedPayload);
             final OpSendMsg op;
 
             // Shouldn't call create(MessageImpl<?> msg, ByteBufPair cmd, long sequenceId, SendCallback callback),