[camel] 02/02: CAMEL-18289: camel-core - fix exchange before sending it when submit in AggregateProcessor (#8038)

[davsclaus]

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 c9c5b24cd8d9381f833ebfecf06145a55190edcc
Author: Amos Feng <zh.f...@gmail.com>
AuthorDate: Tue Jul 26 17:41:01 2022 +0800

    CAMEL-18289: camel-core - fix exchange before sending it when submit in 
AggregateProcessor (#8038)
---
 .../apache/camel/component/xslt/saxon/XsltAggregationStrategyTest.java   | 1 -
 .../java/org/apache/camel/processor/aggregate/AggregateProcessor.java    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltAggregationStrategyTest.java
 
b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltAggregationStrategyTest.java
index b35509ffa5a..4c6a33c74dc 100644
--- 
a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltAggregationStrategyTest.java
+++ 
b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltAggregationStrategyTest.java
@@ -61,7 +61,6 @@ public class XsltAggregationStrategyTest extends 
CamelTestSupport {
                         .aggregate(new 
XsltSaxonAggregationStrategy("org/apache/camel/util/toolbox/aggregate.xsl"))
                         .constant(true)
                         .completionFromBatchConsumer()
-                        .log("after aggregate body: ${body}")
                         .to("mock:transformed");
 
                 
from("file:src/test/resources/org/apache/camel/util/toolbox?noop=true&sortBy=file:name&antInclude=*.xml")
diff --git 
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
 
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
index 83f5fd9512d..306fbdb8263 100644
--- 
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
+++ 
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
@@ -880,6 +880,7 @@ public class AggregateProcessor extends 
AsyncProcessorSupport
 
         // send this exchange
         executorService.execute(() -> {
+            ExchangeHelper.prepareOutToIn(exchange);
 
             Runnable task = () -> processor.process(exchange, done -> {
                 // log exception if there was a problem