This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 80ef1cfcab8519935fc878278a6c9b80d9ab176a
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Jul 26 10:00:54 2022 +0200
Polished
---
.../camel/processor/InterceptSendToEndpointProcessor.java | 7 ++-----
.../src/main/java/org/apache/camel/processor/Pipeline.java | 5 +----
.../src/main/java/org/apache/camel/support/ExchangeHelper.java | 10 ++--------
3 files changed, 5 insertions(+), 17 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
index 17e7bf12623..207032f507c 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
@@ -31,6 +31,7 @@ import org.apache.camel.support.AsyncProcessorConverterHelper;
import org.apache.camel.support.AsyncProcessorSupport;
import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.camel.support.DefaultInterceptSendToEndpoint;
+import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -108,11 +109,7 @@ public class InterceptSendToEndpointProcessor extends
DefaultAsyncProducer {
}
if (!shouldSkip) {
- if (exchange.hasOut()) {
- // replace OUT with IN as detour changed something
- exchange.setIn(exchange.getOut());
- exchange.setOut(null);
- }
+ ExchangeHelper.prepareOutToIn(exchange);
// route to original destination leveraging the asynchronous
routing engine if possible
boolean s = producer.process(exchange, ds -> {
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Pipeline.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Pipeline.java
index 29d7596ef5c..2887bc7c167 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Pipeline.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Pipeline.java
@@ -98,10 +98,7 @@ public class Pipeline extends AsyncProcessorSupport
implements Navigate<Processo
if (!stop && more && (first || continueProcessing(exchange, "so
breaking out of pipeline", LOG))) {
// prepare for next run
- if (exchange.hasOut()) {
- exchange.setIn(exchange.getOut());
- exchange.setOut(null);
- }
+ ExchangeHelper.prepareOutToIn(exchange);
// get the next processor
AsyncProcessor processor = processors.get(index++);
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
index dc348d88348..68e227984cd 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
@@ -574,17 +574,11 @@ public final class ExchangeHelper {
public static void prepareAggregation(Exchange oldExchange, Exchange
newExchange) {
// move body/header from OUT to IN
if (oldExchange != null) {
- if (oldExchange.hasOut()) {
- oldExchange.setIn(oldExchange.getOut());
- oldExchange.setOut(null);
- }
+ ExchangeHelper.prepareOutToIn(oldExchange);
}
if (newExchange != null) {
- if (newExchange.hasOut()) {
- newExchange.setIn(newExchange.getOut());
- newExchange.setOut(null);
- }
+ ExchangeHelper.prepareOutToIn(newExchange);
}
}
