This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new fd272f1a05ce CAMEL-16789: Fix circuit breaker copy constructor bugs
(#25110)
fd272f1a05ce is described below
commit fd272f1a05ced40471972b4f582f34a661249e92
Author: Claus Ibsen <[email protected]>
AuthorDate: Sat Jul 25 14:41:16 2026 +0200
CAMEL-16789: Fix circuit breaker copy constructor bugs (#25110)
* CAMEL-16789: Fix FaultTolerance copy constructor missing
bulkheadWaitingTaskQueue
Co-Authored-By: Claude Opus 4.6 <[email protected]>
Signed-off-by: Claus Ibsen <[email protected]>
* CAMEL-16789: Fix Resilience4j copy constructor copying ignoreExceptions
into recordExceptions
Co-Authored-By: Claude Opus 4.6 <[email protected]>
Signed-off-by: Claus Ibsen <[email protected]>
---------
Signed-off-by: Claus Ibsen <[email protected]>
Co-authored-by: Claude Opus 4.6 <[email protected]>
---
.../java/org/apache/camel/model/FaultToleranceConfigurationCommon.java | 1 +
.../java/org/apache/camel/model/Resilience4jConfigurationCommon.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
index aba2576a014b..a30b45ffcbe4 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationCommon.java
@@ -92,6 +92,7 @@ public class FaultToleranceConfigurationCommon extends
IdentifiedType {
this.timeoutPoolSize = source.timeoutPoolSize;
this.bulkheadEnabled = source.bulkheadEnabled;
this.bulkheadMaxConcurrentCalls = source.bulkheadMaxConcurrentCalls;
+ this.bulkheadWaitingTaskQueue = source.bulkheadWaitingTaskQueue;
this.threadOffloadExecutorService =
source.threadOffloadExecutorService;
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationCommon.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationCommon.java
index 45a47ed98885..4692976749e6 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationCommon.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationCommon.java
@@ -190,7 +190,7 @@ public class Resilience4jConfigurationCommon extends
IdentifiedType {
this.timeoutExecutorService = source.timeoutExecutorService;
this.timeoutDuration = source.timeoutDuration;
this.timeoutCancelRunningFuture = source.timeoutCancelRunningFuture;
- this.recordExceptions = new ArrayList<>(source.ignoreExceptions);
+ this.recordExceptions = new ArrayList<>(source.recordExceptions);
this.ignoreExceptions = new ArrayList<>(source.ignoreExceptions);
}