You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/04/26 17:58:22 UTC
[camel] 04/12: CAMEL-15105: move the history node id flag to the extension
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 f4b502bee09d4d9fc41241a95af6343c8f9cb535
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 18:30:49 2023 +0200
CAMEL-15105: move the history node id flag to the extension
---
.../src/main/java/org/apache/camel/support/AbstractExchange.java | 1 -
.../main/java/org/apache/camel/support/DefaultPooledExchange.java | 2 +-
.../java/org/apache/camel/support/ExtendedExchangeExtension.java | 5 +++--
3 files changed, 4 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 1f84aaf044c..31da48d4ed9 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
@@ -70,7 +70,6 @@ class AbstractExchange implements Exchange {
ExchangePattern pattern;
List<Synchronization> onCompletions;
Boolean externalRedelivered;
- String historyNodeId;
String historyNodeLabel;
String historyNodeSource;
boolean transacted;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
index 5036d995dc0..9d08bed56d0 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
@@ -110,7 +110,7 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
}
// do not reset endpoint/fromRouteId as it would be the same consumer/endpoint again
this.externalRedelivered = null;
- this.historyNodeId = null;
+ getExchangeExtension().setHistoryNodeId(null);
this.historyNodeLabel = null;
this.transacted = false;
this.routeStop = false;
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 0aed71aafd6..10696473c67 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
@@ -36,6 +36,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
private String fromRouteId;
private boolean streamCacheDisabled;
private boolean redeliveryExhausted;
+ private String historyNodeId;
ExtendedExchangeExtension(AbstractExchange exchange) {
this.exchange = exchange;
@@ -136,12 +137,12 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
@Override
public void setHistoryNodeId(String historyNodeId) {
- this.exchange.historyNodeId = historyNodeId;
+ this.historyNodeId = historyNodeId;
}
@Override
public String getHistoryNodeId() {
- return this.exchange.historyNodeId;
+ return this.historyNodeId;
}
@Override