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 466b8f67c2abb9fdbe039ffac0d473314a2333ee Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Wed Apr 26 17:20:15 2023 +0200 CAMEL-15105: move the fromRouteId to the extension --- .../src/main/java/org/apache/camel/support/AbstractExchange.java | 5 ++--- .../java/org/apache/camel/support/ExtendedExchangeExtension.java | 7 ++++++- 2 files changed, 8 insertions(+), 4 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 b6ee98fda89..0e587225a30 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 @@ -68,7 +68,6 @@ class AbstractExchange implements Exchange { String exchangeId; UnitOfWork unitOfWork; ExchangePattern pattern; - String fromRouteId; List<Synchronization> onCompletions; Boolean externalRedelivered; String historyNodeId; @@ -103,11 +102,11 @@ class AbstractExchange implements Exchange { this.context = parent.getContext(); this.pattern = parent.getPattern(); this.created = parent.getCreated(); - this.fromRouteId = parent.getFromRouteId(); this.unitOfWork = parent.getUnitOfWork(); privateExtension = new ExtendedExchangeExtension(this); privateExtension.setFromEndpoint(parent.getFromEndpoint()); + privateExtension.setFromRouteId(parent.getFromRouteId()); } public AbstractExchange(Endpoint fromEndpoint) { @@ -613,7 +612,7 @@ class AbstractExchange implements Exchange { @Override public String getFromRouteId() { - return fromRouteId; + return privateExtension.getFromRouteId(); } @Override 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 0972267c223..0777a14133e 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 @@ -33,6 +33,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension { private Boolean errorHandlerHandled; private boolean failureHandled; private Endpoint fromEndpoint; + private String fromRouteId; ExtendedExchangeExtension(AbstractExchange exchange) { this.exchange = exchange; @@ -50,7 +51,11 @@ public class ExtendedExchangeExtension implements ExchangeExtension { @Override public void setFromRouteId(String fromRouteId) { - exchange.fromRouteId = fromRouteId; + this.fromRouteId = fromRouteId; + } + + public String getFromRouteId() { + return fromRouteId; } /**