You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/03/15 18:55:02 UTC
[camel] branch camel-3.7.x updated (bc6dc1a -> cfc8383)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from bc6dc1a Merge branch 'release/3.7.3' into camel-3.7.x
new 42b4959 CAMEL-16295: fix aggregation when in transacted route (#5214)
new cfc8383 Typo
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/camel/processor/MulticastProcessor.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
[camel] 02/02: Typo
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cfc838376cc119bd6ed077ed786854b500e6d0f4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Mar 15 18:25:26 2021 +0100
Typo
---
.../src/main/java/org/apache/camel/processor/MulticastProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index 8960661..b51e220 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -404,7 +404,7 @@ public class MulticastProcessor extends AsyncProcessorSupport
}
/**
- * Sub taks processed reactive via the {@link ReactiveExecutor}.
+ * Sub task processed reactive via the {@link ReactiveExecutor}.
*/
protected class MulticastReactiveTask extends MulticastTask {
[camel] 01/02: CAMEL-16295: fix aggregation when in transacted
route (#5214)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 42b4959678f6800f4ab12ac7cbeb6309fa2c24ed
Author: Tom Cassimon <to...@tcke.be>
AuthorDate: Mon Mar 15 18:25:35 2021 +0100
CAMEL-16295: fix aggregation when in transacted route (#5214)
Co-authored-by: catom1 <to...@argenta.be>
---
.../java/org/apache/camel/processor/MulticastProcessor.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index 254b2da..8960661 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -586,11 +586,13 @@ public class MulticastProcessor extends AsyncProcessorSupport
return false;
}
- // accept the exchange as a result
- completion.submit(exchangeResult -> exchangeResult.accept(exchange));
+ completion.submit(exchangeResult -> {
+ // accept the exchange as a result
+ exchangeResult.accept(exchange);
- // aggregate exchanges if any
- aggregate();
+ // aggregate exchanges if any
+ aggregate();
+ });
// next step
return true;