[camel] 03/12: CAMEL-15105: move the re-delivery exhausted flag to the extension

[or...@apache.org]

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 ddcb672460c7681527a4accd62f03dd0b663f08e
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 18:26:25 2023 +0200

    CAMEL-15105: move the re-delivery exhausted 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     | 5 +++--
 3 files changed, 5 insertions(+), 5 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 6c8ec5b966d..1f84aaf044c 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
@@ -80,7 +80,6 @@ class AbstractExchange implements Exchange {
     boolean notifyEvent;
     boolean interrupted;
     boolean interruptable = true;
-    boolean redeliveryExhausted;
     AsyncCallback defaultConsumerCallback; // optimize (do not reset)
     Map<String, SafeCopyProperty> safeCopyProperties;
     private final ExtendedExchangeExtension privateExtension;
@@ -154,7 +153,7 @@ class AbstractExchange implements Exchange {
         exchange.setRollbackOnlyLast(rollbackOnlyLast);
         final ExtendedExchangeExtension newExchangeExtension = exchange.getExchangeExtension();
         newExchangeExtension.setNotifyEvent(notifyEvent);
-        newExchangeExtension.setRedeliveryExhausted(redeliveryExhausted);
+        newExchangeExtension.setRedeliveryExhausted(getExchangeExtension().isRedeliveryExhausted());
         newExchangeExtension.setErrorHandlerHandled(getExchangeExtension().getErrorHandlerHandled());
         newExchangeExtension.setStreamCacheDisabled(getExchangeExtension().isStreamCacheDisabled());
 
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 4c8790d4f52..5036d995dc0 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
@@ -119,7 +119,7 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
             this.notifyEvent = false;
             this.interrupted = false;
             this.interruptable = true;
-            this.redeliveryExhausted = false;
+            getExchangeExtension().setRedeliveryExhausted(false);
             getExchangeExtension().setErrorHandlerHandled(null);
             getExchangeExtension().setStreamCacheDisabled(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 2d5bb8199ea..0aed71aafd6 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
@@ -35,6 +35,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
     private Endpoint fromEndpoint;
     private String fromRouteId;
     private boolean streamCacheDisabled;
+    private boolean redeliveryExhausted;
 
     ExtendedExchangeExtension(AbstractExchange exchange) {
         this.exchange = exchange;
@@ -100,12 +101,12 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
 
     @Override
     public boolean isRedeliveryExhausted() {
-        return this.exchange.redeliveryExhausted;
+        return this.redeliveryExhausted;
     }
 
     @Override
     public void setRedeliveryExhausted(boolean redeliveryExhausted) {
-        this.exchange.redeliveryExhausted = redeliveryExhausted;
+        this.redeliveryExhausted = redeliveryExhausted;
     }
 
     @Override