[camel] 02/12: CAMEL-15105: move the stream cache 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 93b6dab2904dc46e23677ab6347108aee750de2c
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 18:25:11 2023 +0200

    CAMEL-15105: move the stream cache 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 0e587225a30..6c8ec5b966d 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
@@ -81,7 +81,6 @@ class AbstractExchange implements Exchange {
     boolean interrupted;
     boolean interruptable = true;
     boolean redeliveryExhausted;
-    boolean streamCacheDisabled;
     AsyncCallback defaultConsumerCallback; // optimize (do not reset)
     Map<String, SafeCopyProperty> safeCopyProperties;
     private final ExtendedExchangeExtension privateExtension;
@@ -157,7 +156,7 @@ class AbstractExchange implements Exchange {
         newExchangeExtension.setNotifyEvent(notifyEvent);
         newExchangeExtension.setRedeliveryExhausted(redeliveryExhausted);
         newExchangeExtension.setErrorHandlerHandled(getExchangeExtension().getErrorHandlerHandled());
-        newExchangeExtension.setStreamCacheDisabled(streamCacheDisabled);
+        newExchangeExtension.setStreamCacheDisabled(getExchangeExtension().isStreamCacheDisabled());
 
         // copy properties after body as body may trigger lazy init
         if (hasProperties()) {
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 fe44c36ef90..4c8790d4f52 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
@@ -121,7 +121,7 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
             this.interruptable = true;
             this.redeliveryExhausted = false;
             getExchangeExtension().setErrorHandlerHandled(null);
-            this.streamCacheDisabled = false;
+            getExchangeExtension().setStreamCacheDisabled(false);
 
             if (onDone != null) {
                 onDone.onDone(this);
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 0777a14133e..2d5bb8199ea 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
@@ -34,6 +34,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
     private boolean failureHandled;
     private Endpoint fromEndpoint;
     private String fromRouteId;
+    private boolean streamCacheDisabled;
 
     ExtendedExchangeExtension(AbstractExchange exchange) {
         this.exchange = exchange;
@@ -62,14 +63,14 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
      * Is stream caching disabled on the given exchange
      */
     public boolean isStreamCacheDisabled() {
-        return this.exchange.streamCacheDisabled;
+        return this.streamCacheDisabled;
     }
 
     /**
      * Used to force disabling stream caching which some components can do in special use-cases.
      */
     public void setStreamCacheDisabled(boolean streamCacheDisabled) {
-        this.exchange.streamCacheDisabled = streamCacheDisabled;
+        this.streamCacheDisabled = streamCacheDisabled;
     }
 
     @Override