[camel] 06/12: CAMEL-15105: move the history node label to the extension

[orpiske]

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 40cae08f4cbfb358bc784d4218207d868ad6a1a2
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Wed Apr 26 18:36:56 2023 +0200

    CAMEL-15105: move the history node label 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 a19e5da1c60..60c8299e9a4 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 historyNodeLabel;
     boolean transacted;
     boolean routeStop;
     boolean rollbackOnly;
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 9d08bed56d0..00bbbebfe2f 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
@@ -111,7 +111,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;
             getExchangeExtension().setHistoryNodeId(null);
-            this.historyNodeLabel = null;
+            getExchangeExtension().setHistoryNodeLabel(null);
             this.transacted = false;
             this.routeStop = false;
             this.rollbackOnly = 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 ab1f93d6586..b59fb811e28 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
@@ -38,6 +38,7 @@ public class ExtendedExchangeExtension implements 
ExchangeExtension {
     private boolean redeliveryExhausted;
     private String historyNodeId;
     private String historyNodeSource;
+    private String historyNodeLabel;
 
     ExtendedExchangeExtension(AbstractExchange exchange) {
         this.exchange = exchange;
@@ -158,12 +159,12 @@ public class ExtendedExchangeExtension implements 
ExchangeExtension {
 
     @Override
     public String getHistoryNodeLabel() {
-        return this.exchange.historyNodeSource;
+        return this.historyNodeLabel;
     }
 
     @Override
     public void setHistoryNodeLabel(String historyNodeLabel) {
-        this.exchange.historyNodeLabel = historyNodeLabel;
+        this.historyNodeLabel = historyNodeLabel;
     }
 
     @Override