[camel] branch master updated: CAMEL-15344: Fixed Delay EIP in regards to inflight count being doubled when doing graceful shutdown.

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new c2bbbe7  CAMEL-15344: Fixed Delay EIP in regards to inflight count being doubled when doing graceful shutdown.
c2bbbe7 is described below

commit c2bbbe74aecd9832c371e15c7087d70ed9bf5656
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jul 29 08:51:44 2020 +0200

    CAMEL-15344: Fixed Delay EIP in regards to inflight count being doubled when doing graceful shutdown.
---
 .../apache/camel/processor/DelayProcessorSupport.java  | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java b/core/camel-base/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java
index e65164a..5e7aea9 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java
@@ -25,8 +25,6 @@ import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.camel.ShutdownRunningTask;
-import org.apache.camel.spi.ShutdownAware;
 import org.apache.camel.support.processor.DelegateAsyncProcessor;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
@@ -38,7 +36,7 @@ import org.slf4j.LoggerFactory;
  * <p/>
  * This implementation will block while waiting.
  */
-public abstract class DelayProcessorSupport extends DelegateAsyncProcessor implements ShutdownAware {
+public abstract class DelayProcessorSupport extends DelegateAsyncProcessor {
 
     private static final Logger LOG = LoggerFactory.getLogger(DelayProcessorSupport.class);
 
@@ -277,18 +275,4 @@ public abstract class DelayProcessorSupport extends DelegateAsyncProcessor imple
         super.doShutdown();
     }
 
-    @Override
-    public boolean deferShutdown(ShutdownRunningTask shutdownRunningTask) {
-        return true;
-    }
-
-    @Override
-    public int getPendingExchangesSize() {
-        return getDelayedCount();
-    }
-
-    @Override
-    public void prepareShutdown(boolean suspendOnly, boolean forced) {
-
-    }
 }