This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 85be91ec1afa7b2f9313e7fbbb4b3a6cd50586a2 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Tue Apr 25 18:30:44 2023 +0200 CAMEL-15105: move the failure handler instance to the extension --- .../src/main/java/org/apache/camel/support/AbstractExchange.java | 1 - .../java/org/apache/camel/support/ExtendedExchangeExtension.java | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java index 201964174b4..2ee35f307e8 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java @@ -84,7 +84,6 @@ class AbstractExchange implements Exchange { boolean interruptable = true; boolean redeliveryExhausted; boolean streamCacheDisabled; - boolean failureHandled; AsyncCallback defaultConsumerCallback; // optimize (do not reset) Map<String, SafeCopyProperty> safeCopyProperties; private final ExtendedExchangeExtension privateExtension; diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java index dc853865b54..ae1934a9dbe 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java @@ -31,6 +31,7 @@ import org.apache.camel.spi.UnitOfWork; public class ExtendedExchangeExtension implements ExchangeExtension { private final AbstractExchange exchange; private Boolean errorHandlerHandled; + private boolean failureHandled; ExtendedExchangeExtension(AbstractExchange exchange) { this.exchange = exchange; @@ -217,11 +218,11 @@ public class ExtendedExchangeExtension implements ExchangeExtension { @Override public boolean isFailureHandled() { - return this.exchange.failureHandled; + return this.failureHandled; } @Override public void setFailureHandled(boolean failureHandled) { - this.exchange.failureHandled = failureHandled; + this.failureHandled = failureHandled; } }
