ARTEMIS-4314 Small Tweak: using executor directly if no delay

apache · Jun 17, 2023 · c6a82ff · c6a82ff
1 parent 9b5dbf4
commit c6a82ff
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/...n/java/org/apache/activemq/artemis/core/server/federation/FederatedQueueConsumerImpl.java b/...n/java/org/apache/activemq/artemis/core/server/federation/FederatedQueueConsumerImpl.java
@@ -208,23 +208,29 @@ public Executor getExecutor() {
    }
 
    private void scheduleCreditOnEmpty(final int delay, final QueueHandle handle) {
-      scheduledExecutorService.schedule(() -> {
-         // use queue executor to sync on message count metric
-         handle.getExecutor().execute(() -> {
-            if (clientConsumer != null) {
-               if (0L == handle.getMessageCount()) {
-                  flow(handle.getCreditWindow());
-                  pendingPullCredit.set(handle.getCreditWindow());
-               } else {
-                  if (0 == delay) {
-                     clientConsumer.resetIfSlowConsumer();
-                     pendingPullCredit.set(0);
-                  }
-                  scheduleCreditOnEmpty(FederatedQueueConsumer.getNextDelay(delay, intialConnectDelayMultiplier, intialConnectDelayMax), handle);
+
+      Runnable runnable = () -> {
+         if (clientConsumer != null) {
+            if (0L == handle.getMessageCount()) {
+               flow(handle.getCreditWindow());
+               pendingPullCredit.set(handle.getCreditWindow());
+            } else {
+               if (0 == delay) {
+                  clientConsumer.resetIfSlowConsumer();
+                  pendingPullCredit.set(0);
                }
+               scheduleCreditOnEmpty(FederatedQueueConsumer.getNextDelay(delay, intialConnectDelayMultiplier, intialConnectDelayMax), handle);
             }
-         });
-      }, delay, TimeUnit.SECONDS);
+         }
+      };
+
+      if (delay == 0) { // if delay==0 just use the executor directly
+         handle.getExecutor().execute(runnable);
+      } else {
+         scheduledExecutorService.schedule(() -> {
+            handle.getExecutor().execute(runnable);
+         }, delay, TimeUnit.SECONDS);
+      }
    }
 
    private void flow(int creditWindow) {