[camel] branch camel-3.11.x updated: CAMEL-17095: camel-resilience4j - Using timeout and bulkhead together does not work

[davsclaus]

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

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


The following commit(s) were added to refs/heads/camel-3.11.x by this push:
     new 169da34  CAMEL-17095: camel-resilience4j - Using timeout and bulkhead 
together does not work
169da34 is described below

commit 169da3444e72fe550e4dca7c93c0e99a9c869b81
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun Oct 17 14:01:29 2021 +0200

    CAMEL-17095: camel-resilience4j - Using timeout and bulkhead together does 
not work
---
 .../org/apache/camel/component/resilience4j/ResilienceProcessor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessor.java
 
b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessor.java
index 29a7320..1dda324 100644
--- 
a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessor.java
+++ 
b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessor.java
@@ -474,7 +474,7 @@ public class ResilienceProcessor extends 
AsyncProcessorSupport
             callable = task;
         }
         if (bulkhead != null) {
-            callable = Bulkhead.decorateCallable(bulkhead, task);
+            callable = Bulkhead.decorateCallable(bulkhead, callable);
         }
 
         callable = CircuitBreaker.decorateCallable(circuitBreaker, callable);