Skip to content

Commit 63a2bd9

Browse files
[fix][broker] Fix NPE when getting delayed delivery policy (apache#24512)
1 parent a40ac3c commit 63a2bd9

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -977,11 +977,13 @@ protected CompletableFuture<DelayedDeliveryPolicies> internalGetDelayedDeliveryP
977977
TopicPolicies policies = op.orElseGet(TopicPolicies::new);
978978
DelayedDeliveryPolicies delayedDeliveryPolicies = null;
979979
if (policies.isDelayedDeliveryEnabledSet() && policies.isDelayedDeliveryTickTimeMillisSet()) {
980-
delayedDeliveryPolicies = DelayedDeliveryPolicies.builder()
980+
DelayedDeliveryPolicies.Builder builder = DelayedDeliveryPolicies.builder()
981981
.tickTime(policies.getDelayedDeliveryTickTimeMillis())
982-
.active(policies.getDelayedDeliveryEnabled())
983-
.maxDeliveryDelayInMillis(policies.getDelayedDeliveryMaxDelayInMillis())
984-
.build();
982+
.active(policies.getDelayedDeliveryEnabled());
983+
if (policies.isDelayedDeliveryMaxDelayInMillisSet()) {
984+
builder.maxDeliveryDelayInMillis(policies.getDelayedDeliveryMaxDelayInMillis());
985+
}
986+
delayedDeliveryPolicies = builder.build();
985987
}
986988
if (delayedDeliveryPolicies == null && applied) {
987989
delayedDeliveryPolicies = getNamespacePolicies(namespaceName).delayed_delivery_policies;

pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicPolicies.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@ public boolean isDelayedDeliveryEnabledSet(){
128128
return delayedDeliveryEnabled != null;
129129
}
130130

131+
public boolean isDelayedDeliveryMaxDelayInMillisSet(){
132+
return delayedDeliveryMaxDelayInMillis != null;
133+
}
134+
131135
public boolean isMaxUnackedMessagesOnSubscriptionSet() {
132136
return maxUnackedMessagesOnSubscription != null;
133137
}

0 commit comments

Comments
 (0)