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:25 UTC

[camel] 07/12: CAMEL-15105: move the transacted 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 7b0ff81957b01736ae293d7a9b91fded8db800f9
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 18:40:37 2023 +0200

    CAMEL-15105: move the transacted flag to the extension
---
 .../src/main/java/org/apache/camel/support/AbstractExchange.java   | 3 +--
 .../main/java/org/apache/camel/support/DefaultPooledExchange.java  | 2 +-
 .../java/org/apache/camel/support/ExtendedExchangeExtension.java   | 7 ++++++-
 3 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 60c8299e9a4..f26711aa6f7 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;
-    boolean transacted;
     boolean routeStop;
     boolean rollbackOnly;
     boolean rollbackOnlyLast;
@@ -630,7 +629,7 @@ class AbstractExchange implements Exchange {
 
     @Override
     public boolean isTransacted() {
-        return transacted;
+        return privateExtension.isTransacted();
     }
 
     @Override
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 00bbbebfe2f..d80972babd7 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
@@ -112,7 +112,7 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
             this.externalRedelivered = null;
             getExchangeExtension().setHistoryNodeId(null);
             getExchangeExtension().setHistoryNodeLabel(null);
-            this.transacted = false;
+            getExchangeExtension().setTransacted(false);
             this.routeStop = false;
             this.rollbackOnly = false;
             this.rollbackOnlyLast = 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 b59fb811e28..baf4aece5ac 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
@@ -39,6 +39,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
     private String historyNodeId;
     private String historyNodeSource;
     private String historyNodeLabel;
+    private boolean transacted;
 
     ExtendedExchangeExtension(AbstractExchange exchange) {
         this.exchange = exchange;
@@ -189,7 +190,11 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
 
     @Override
     public void setTransacted(boolean transacted) {
-        this.exchange.transacted = transacted;
+        this.transacted = transacted;
+    }
+
+    public boolean isTransacted() {
+        return transacted;
     }
 
     @Override