File tree Expand file tree Collapse file tree
pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl
pulsar-common/src/main/java/org/apache/pulsar/common/policies/data Expand file tree Collapse file tree Original file line number Diff line number Diff 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 ;
Original file line number Diff line number Diff 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 }
You can’t perform that action at this time.
0 commit comments