You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by eo...@apache.org on 2021/07/05 12:17:28 UTC
[pulsar] branch branch-2.8 updated: Fixed using
CommandSubscribe.getConsumerName() without checking (#11199)
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch branch-2.8
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.8 by this push:
new 9e38f07 Fixed using CommandSubscribe.getConsumerName() without checking (#11199)
9e38f07 is described below
commit 9e38f07e8f37164280fd4f6958ed048eb2f62899
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Fri Jul 2 20:21:31 2021 +0200
Fixed using CommandSubscribe.getConsumerName() without checking (#11199)
(cherry picked from commit 707cb1a8c9a916673aec2525cc7cecdb5bf0487b)
---
.../src/main/java/org/apache/pulsar/broker/service/ServerCnx.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
index 8006b89..26dbd22 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
@@ -905,14 +905,14 @@ public class ServerCnx extends PulsarHandler implements TransportCnx {
final String subscriptionName = subscribe.getSubscription();
final SubType subType = subscribe.getSubType();
- final String consumerName = subscribe.getConsumerName();
+ final String consumerName = subscribe.hasConsumerName() ? subscribe.getConsumerName() : "";
final boolean isDurable = subscribe.isDurable();
final MessageIdImpl startMessageId = subscribe.hasStartMessageId() ? new BatchMessageIdImpl(
subscribe.getStartMessageId().getLedgerId(), subscribe.getStartMessageId().getEntryId(),
subscribe.getStartMessageId().getPartition(), subscribe.getStartMessageId().getBatchIndex())
: null;
final int priorityLevel = subscribe.hasPriorityLevel() ? subscribe.getPriorityLevel() : 0;
- final boolean readCompacted = subscribe.isReadCompacted();
+ final boolean readCompacted = subscribe.hasReadCompacted() && subscribe.isReadCompacted();
final Map<String, String> metadata = CommandUtils.metadataFromCommand(subscribe);
final InitialPosition initialPosition = subscribe.getInitialPosition();
final long startMessageRollbackDurationSec = subscribe.hasStartMessageRollbackDurationSec()