apply comments

apache · Aug 19, 2022 · 728bba5 · 728bba5
1 parent 14f5603
commit 728bba5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
@@ -381,9 +381,8 @@ private void updateTopicPolicyByBrokerConfig() {
                 .updateBrokerValue(formatSchemaCompatibilityStrategy(schemaCompatibilityStrategy));
         topicPolicies.getDispatchRate().updateBrokerValue(dispatchRateInBroker(config));
         topicPolicies.getSchemaValidationEnforced().updateBrokerValue(config.isSchemaValidationEnforced());
-        topicPolicies.getEntryFilters().updateBrokerValue(new EntryFilters("",
-                String.join(",", config.getEntryFilterNames()),
-                config.getEntryFiltersDirectory()));
+        topicPolicies.getEntryFilters().updateBrokerValue(new EntryFilters(String.join(",",
+                config.getEntryFilterNames())));
     }
 
     private DispatchRateImpl dispatchRateInBroker(ServiceConfiguration config) {

diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractBaseDispatcherTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractBaseDispatcherTest.java
@@ -211,10 +211,6 @@ protected boolean isConsumersExceededOnSubscription() {
 
         @Override
         public boolean trackDelayedDelivery(long ledgerId, long entryId, MessageMetadata msgMetadata) {
-            if (!msgMetadata.hasDeliverAtTime()) {
-                // No need to initialize the tracker here
-                return false;
-            }
             //for test.
             return true;
         }